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

Commit

Permalink
Fix builds location and tests
Browse files Browse the repository at this point in the history
- place builds into build folder
- fix test loaders for new repo name
- add "tools" repo to bower.json
  • Loading branch information
dfreedm committed Nov 20, 2013
1 parent 2606d15 commit 3532ceb
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

/test.bat

/build/shadowdom.conditional.js
/build/platform*
*.min.js*
*.concat.js*
build.bat
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"HTMLImports": "Polymer/HTMLImports#master",
"PointerGestures":"Polymer/PointerGestures#master",
"ShadowDOM": "Polymer/ShadowDOM#master",
"polymer-expressions": "Polymer/polymer-expressions#master"
"polymer-expressions": "Polymer/polymer-expressions#master",
"tools": "Polymer/tools#master"
},
"license": "BSD",
"private": true,
Expand Down
16 changes: 8 additions & 8 deletions conf/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ module.exports = function(karma) {
// list of files / patterns to load in the browser
files: [
'tools/test/mocha-htmltest.js',
'platform/conf/mocha.conf.js',
'platform/../tools/test/chai/chai.js',
'platform/test/js/*.js',
'platform-dev/conf/mocha.conf.js',
'tools/test/chai/chai.js',
'platform-dev/test/js/*.js',
{pattern: 'CustomElements/custom-elements.js', included: false},
{pattern: 'CustomElements/src/*.js', included: false},
{pattern: 'HTMLImports/html-imports.js', included: false},
Expand All @@ -29,11 +29,11 @@ module.exports = function(karma) {
{pattern: 'WeakMap/weakmap.js', included: false},
{pattern: 'observe-js/src/*.js', included: false},
{pattern: 'observe-js/util/*.js', included: false},
{pattern: 'platform/../tools/test/mocha/mocha.*', included: false},
{pattern: 'platform/platform.*', included: false},
{pattern: 'platform/src/*.js', included: false},
{pattern: 'platform/test/**/*.html', included: false},
{pattern: 'platform/test/**/*.js', included: false},
{pattern: 'platform-dev/../tools/test/mocha/mocha.*', included: false},
{pattern: 'platform-dev/platform.*', included: false},
{pattern: 'platform-dev/src/*.js', included: false},
{pattern: 'platform-dev/test/**/*.html', included: false},
{pattern: 'platform-dev/test/**/*.js', included: false},
{pattern: 'polymer-expressions/src/*.js', included: false},
{pattern: 'polymer-expressions/tests/*.js', included: false},
{pattern: 'polymer-expressions/third_party/**/*.js', included: false},
Expand Down
4 changes: 2 additions & 2 deletions conf/mocha.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ mocha.setup({
ui: 'tdd',
slow: 1000,
timeout: 30000,
ignoreLeaks: true,
htmlbase: '/base/platform/test/'
ignoreLeaks: true,
htmlbase: '/base/platform-dev/test/'
});
17 changes: 9 additions & 8 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ module.exports = function(grunt) {
nonull: true
},
files: {
'platform.concat.js': readManifest('build.json')
'build/platform.concat.js': readManifest('build.json')
}
}
},
concat: {
lite: {
files: {
'platform-lite.concat.js': readManifest('build-lite.json')
'build/platform-lite.concat.js': readManifest('build-lite.json')
}
}
},
Expand All @@ -46,12 +46,13 @@ module.exports = function(grunt) {
},
Platform: {
options: {
sourceMap: 'platform.min.js.map',
sourceMapIn: 'platform.concat.js.map',
sourceMap: 'build/platform.js.map',
sourceMapIn: 'build/platform.concat.js.map',
sourceMappingURL: "platform.js.map",
banner: grunt.file.read('LICENSE')
},
files: {
'platform.min.js': 'platform.concat.js'
'build/platform.js': 'build/platform.concat.js'
}
}
},
Expand Down Expand Up @@ -86,17 +87,17 @@ module.exports = function(grunt) {
grunt.registerTask('stash', 'prepare for testing build', function() {
grunt.option('force', true);
grunt.task.run('move:platform.js:platform.js.bak');
grunt.task.run('move:platform.min.js:platform.js');
grunt.task.run('move:build/platform.js:platform.js');
});
grunt.registerTask('restore', function() {
grunt.task.run('move:platform.js:platform.min.js');
grunt.task.run('move:platform.js:build/platform.js');
grunt.task.run('move:platform.js.bak:platform.js');
grunt.option('force', false);
});

grunt.registerTask('test-build', ['default', 'stash', 'test', 'restore']);

grunt.registerTask('default', ['concat_sourcemap', 'uglify', 'sourcemap_copy:platform.concat.js.map:platform.min.js.map']);
grunt.registerTask('default', ['concat_sourcemap', 'uglify', 'sourcemap_copy:build/platform.concat.js.map:build/platform.js.map']);
grunt.registerTask('docs', ['yuidoc']);
grunt.registerTask('test', ['override-chrome-launcher', 'karma:platform']);
grunt.registerTask('test-buildbot', ['override-chrome-launcher', 'karma:buildbot', 'test-build']);
Expand Down

0 comments on commit 3532ceb

Please sign in to comment.