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

Commit

Permalink
fix polymer build tests by injecting polymer html import on karma runs
Browse files Browse the repository at this point in the history
  • Loading branch information
dfreedm committed Dec 19, 2013
1 parent f3eb922 commit 1ea451e
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 27 deletions.
6 changes: 6 additions & 0 deletions build/polymer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!--
Copyright 2013 The Polymer Authors. All rights reserved.
Use of this source code is governed by a BSD-style
license that can be found in the LICENSE file.
-->
<script src="build/polymer.js"></script>
26 changes: 3 additions & 23 deletions conf/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,8 @@ module.exports = function(karma) {
'tools/test/mocha-htmltest.js',
'polymer-dev/conf/mocha.conf.js',
'polymer-dev/node_modules/chai/chai.js',
'platform/platform.js',
'polymer-dev/src/polymer.js',
'polymer-dev/src/boot.js',
'polymer-dev/src/lib/lang.js',
'polymer-dev/src/lib/job.js',
'polymer-dev/src/lib/dom.js',
'polymer-dev/src/lib/super.js',
'polymer-dev/src/lib/deserialize.js',
'polymer-dev/src/api.js',
'polymer-dev/src/instance/utils.js',
'polymer-dev/src/instance/events.js',
'polymer-dev/src/instance/attributes.js',
'polymer-dev/src/instance/properties.js',
'polymer-dev/src/instance/mdv.js',
'polymer-dev/src/instance/base.js',
'polymer-dev/src/instance/styles.js',
'polymer-dev/src/declaration/path.js',
'polymer-dev/src/declaration/styles.js',
'polymer-dev/src/declaration/events.js',
'polymer-dev/src/declaration/properties.js',
'polymer-dev/src/declaration/attributes.js',
'polymer-dev/src/declaration/prototype.js',
'polymer-dev/src/declaration/polymer-element.js',
'platform/platform.js',
'polymer-dev/test/lib/karma-include-polymer.js',
'polymer-dev/test/js/*.js',
{pattern: 'CustomElements/custom-elements.js', included: false},
{pattern: 'CustomElements/src/*.js', included: false},
Expand Down Expand Up @@ -61,6 +40,7 @@ module.exports = function(karma) {
{pattern: 'polymer-expressions/third_party/**/*.js', included: false},
{pattern: 'polymer-dev/polymer.html', included: false},
{pattern: 'polymer-dev/src/**/*.js', included: false},
{pattern: 'polymer-dev/build/polymer.js', included: false},
{pattern: 'polymer-dev/test/**/*.css', included: false},
{pattern: 'polymer-dev/test/**/*.html', included: false},
{pattern: 'polymer-dev/test/**/*.js', included: false},
Expand Down
8 changes: 4 additions & 4 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ module.exports = function(grunt) {

grunt.registerTask('stash', 'prepare for testing build', function() {
grunt.option('force', true);
grunt.task.run('move:polymer.js:polymer.js.bak');
grunt.task.run('move:build/polymer.js:polymer.js');
grunt.task.run('move:polymer.html:polymer.html.bak');
grunt.task.run('move:build/polymer.html:polymer.html');
});
grunt.registerTask('restore', function() {
grunt.task.run('move:polymer.js:build/polymer.js');
grunt.task.run('move:polymer.js.bak:polymer.js');
grunt.task.run('move:polymer.html:build/polymer.html');
grunt.task.run('move:polymer.html.bak:polymer.html');
grunt.option('force', false);
});

Expand Down
12 changes: 12 additions & 0 deletions test/lib/karma-include-polymer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(function() {
window.__karma__.loaded = function(){
window.addEventListener('WebComponentsReady', function() {
window.__karma__.start();
});
};

var l = document.createElement('link');
l.rel = 'import';
l.href = 'base/polymer-dev/polymer.html';
document.head.appendChild(l);
})();

0 comments on commit 1ea451e

Please sign in to comment.