Skip to content
This repository was archived by the owner on Mar 13, 2018. It is now read-only.

Commit 1ea451e

Browse files
committed
fix polymer build tests by injecting polymer html import on karma runs
1 parent f3eb922 commit 1ea451e

4 files changed

Lines changed: 25 additions & 27 deletions

File tree

build/polymer.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<!--
2+
Copyright 2013 The Polymer Authors. All rights reserved.
3+
Use of this source code is governed by a BSD-style
4+
license that can be found in the LICENSE file.
5+
-->
6+
<script src="build/polymer.js"></script>

conf/karma.conf.js

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,8 @@ module.exports = function(karma) {
99
'tools/test/mocha-htmltest.js',
1010
'polymer-dev/conf/mocha.conf.js',
1111
'polymer-dev/node_modules/chai/chai.js',
12-
'platform/platform.js',
13-
'polymer-dev/src/polymer.js',
14-
'polymer-dev/src/boot.js',
15-
'polymer-dev/src/lib/lang.js',
16-
'polymer-dev/src/lib/job.js',
17-
'polymer-dev/src/lib/dom.js',
18-
'polymer-dev/src/lib/super.js',
19-
'polymer-dev/src/lib/deserialize.js',
20-
'polymer-dev/src/api.js',
21-
'polymer-dev/src/instance/utils.js',
22-
'polymer-dev/src/instance/events.js',
23-
'polymer-dev/src/instance/attributes.js',
24-
'polymer-dev/src/instance/properties.js',
25-
'polymer-dev/src/instance/mdv.js',
26-
'polymer-dev/src/instance/base.js',
27-
'polymer-dev/src/instance/styles.js',
28-
'polymer-dev/src/declaration/path.js',
29-
'polymer-dev/src/declaration/styles.js',
30-
'polymer-dev/src/declaration/events.js',
31-
'polymer-dev/src/declaration/properties.js',
32-
'polymer-dev/src/declaration/attributes.js',
33-
'polymer-dev/src/declaration/prototype.js',
34-
'polymer-dev/src/declaration/polymer-element.js',
12+
'platform/platform.js',
13+
'polymer-dev/test/lib/karma-include-polymer.js',
3514
'polymer-dev/test/js/*.js',
3615
{pattern: 'CustomElements/custom-elements.js', included: false},
3716
{pattern: 'CustomElements/src/*.js', included: false},
@@ -61,6 +40,7 @@ module.exports = function(karma) {
6140
{pattern: 'polymer-expressions/third_party/**/*.js', included: false},
6241
{pattern: 'polymer-dev/polymer.html', included: false},
6342
{pattern: 'polymer-dev/src/**/*.js', included: false},
43+
{pattern: 'polymer-dev/build/polymer.js', included: false},
6444
{pattern: 'polymer-dev/test/**/*.css', included: false},
6545
{pattern: 'polymer-dev/test/**/*.html', included: false},
6646
{pattern: 'polymer-dev/test/**/*.js', included: false},

gruntfile.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ module.exports = function(grunt) {
9090

9191
grunt.registerTask('stash', 'prepare for testing build', function() {
9292
grunt.option('force', true);
93-
grunt.task.run('move:polymer.js:polymer.js.bak');
94-
grunt.task.run('move:build/polymer.js:polymer.js');
93+
grunt.task.run('move:polymer.html:polymer.html.bak');
94+
grunt.task.run('move:build/polymer.html:polymer.html');
9595
});
9696
grunt.registerTask('restore', function() {
97-
grunt.task.run('move:polymer.js:build/polymer.js');
98-
grunt.task.run('move:polymer.js.bak:polymer.js');
97+
grunt.task.run('move:polymer.html:build/polymer.html');
98+
grunt.task.run('move:polymer.html.bak:polymer.html');
9999
grunt.option('force', false);
100100
});
101101

test/lib/karma-include-polymer.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
(function() {
2+
window.__karma__.loaded = function(){
3+
window.addEventListener('WebComponentsReady', function() {
4+
window.__karma__.start();
5+
});
6+
};
7+
8+
var l = document.createElement('link');
9+
l.rel = 'import';
10+
l.href = 'base/polymer-dev/polymer.html';
11+
document.head.appendChild(l);
12+
})();

0 commit comments

Comments
 (0)