-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #204 from Polymer/master
7/11 master -> stable
- Loading branch information
Showing
92 changed files
with
2,661 additions
and
8,886 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| /platform/min/*.js | ||
| node_modules | ||
| docs | ||
| local.json | ||
| /test.bat | ||
| polymer.min* | ||
| polymer.sandbox* | ||
| polymer.native* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,108 @@ | ||
| // Sample Karma configuration file, that contain pretty much all the available options | ||
| // It's used for running client tests on Travis (http://travis-ci.org/#!/karma-runner/karma) | ||
| // Most of the options can be overriden by cli arguments (see karma --help) | ||
| // | ||
| // For all available config options and default values, see: | ||
| // https://github.com/karma-runner/karma/blob/stable/lib/config.js#L54 | ||
|
|
||
|
|
||
| // base path, that will be used to resolve files and exclude | ||
| basePath = '../../'; | ||
|
|
||
| // list of files / patterns to load in the browser | ||
| files = [ | ||
| 'polymer/tools/test/mocha-htmltest.js', | ||
| 'polymer/conf/mocha.conf.js', | ||
| 'polymer/node_modules/chai/chai.js', | ||
| 'polymer/polymer.js', | ||
| 'polymer/test/js/*.js', | ||
| {pattern: 'platform/*.js', included: false}, | ||
| {pattern: 'polymer/tools/**/*.js', included: false}, | ||
| {pattern: 'polymer/src/*.js', included: false}, | ||
| {pattern: 'polymer/test/**/*.html', included: false}, | ||
| {pattern: 'polymer/test/**/*.css', included: false}, | ||
| {pattern: 'polymer/test/**/*.js', included: false} | ||
| ]; | ||
|
|
||
| // list of files to exclude | ||
| exclude = []; | ||
|
|
||
| frameworks = ['mocha']; | ||
|
|
||
| // use dots reporter, as travis terminal does not support escaping sequences | ||
| // possible values: 'dots', 'progress', 'junit', 'teamcity' | ||
| // CLI --reporters progress | ||
| reporters = ['progress']; | ||
|
|
||
| // web server port | ||
| // CLI --port 9876 | ||
| port = 9876; | ||
|
|
||
| // cli runner port | ||
| // CLI --runner-port 9100 | ||
| runnerPort = 9100; | ||
|
|
||
| // enable / disable colors in the output (reporters and logs) | ||
| // CLI --colors --no-colors | ||
| colors = true; | ||
|
|
||
| // level of logging | ||
| // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG | ||
| // CLI --log-level debug | ||
| logLevel = LOG_INFO; | ||
|
|
||
| // enable / disable watching file and executing tests whenever any file changes | ||
| // CLI --auto-watch --no-auto-watch | ||
| autoWatch = true; | ||
|
|
||
| // Start these browsers, currently available: | ||
| // - Chrome | ||
| // - ChromeCanary | ||
| // - Firefox | ||
| // - Opera | ||
| // - Safari (only Mac) | ||
| // - PhantomJS | ||
| // - IE (only Windows) | ||
| // CLI --browsers Chrome,Firefox,Safari | ||
| browsers = ['ChromeCanary']; | ||
|
|
||
| // If browser does not capture in given timeout [ms], kill it | ||
| // CLI --capture-timeout 5000 | ||
| captureTimeout = 50000; | ||
|
|
||
| // Auto run tests on start (when browsers are captured) and exit | ||
| // CLI --single-run --no-single-run | ||
| singleRun = true; | ||
|
|
||
| // report which specs are slower than 500ms | ||
| // CLI --report-slower-than 500 | ||
| reportSlowerThan = 500; | ||
|
|
||
| // compile coffee scripts | ||
| preprocessors = { | ||
| module.exports = function(karma) { | ||
| karma.configure({ | ||
| // base path, that will be used to resolve files and exclude | ||
| basePath: '../../', | ||
|
|
||
| // list of files / patterns to load in the browser | ||
| files: [ | ||
| 'polymer/tools/test/mocha-htmltest.js', | ||
| 'polymer/conf/mocha.conf.js', | ||
| 'polymer/node_modules/chai/chai.js', | ||
| 'polymer/polymer.js', | ||
| 'polymer/test/js/*.js', | ||
| {pattern: 'platform/*.js', included: false}, | ||
| {pattern: 'platform/tools/**/*.js', included: false}, | ||
| {pattern: 'platform/platform.*', included: false}, | ||
| {pattern: 'platform/test/**/*.html', included: false}, | ||
| {pattern: 'platform/test/**/*.js', included: false}, | ||
| {pattern: 'platform/src/*.js', included: false}, | ||
| {pattern: 'CustomElements/custom-elements.js', included: false}, | ||
| {pattern: 'CustomElements/MutationObservers/*.js', included: false}, | ||
| {pattern: 'CustomElements/src/*.js', included: false}, | ||
| {pattern: 'HTMLImports/html-imports.js', included: false}, | ||
| {pattern: 'HTMLImports/src/*', included: false}, | ||
| {pattern: 'mdv/mdv.js', included: false}, | ||
| {pattern: 'mdv/src/*', included: false}, | ||
| {pattern: 'mdv/third_party/**/*.js', included: false}, | ||
| {pattern: 'mdv/util/*.js', included: false}, | ||
| {pattern: 'mdv/tests/*.js', included: false}, | ||
| {pattern: 'ShadowDOM/shadowdom.js', included: false}, | ||
| {pattern: 'ShadowDOM/src/**/*.js', included: false}, | ||
| {pattern: 'PointerEvents/pointerevents.js', included: false}, | ||
| {pattern: 'PointerEvents/src/*.js', included: false}, | ||
| {pattern: 'PointerGestures/pointergestures.js', included: false}, | ||
| {pattern: 'PointerGestures/src/*.js', included: false}, | ||
| {pattern: 'polymer/tools/**/*.js', included: false}, | ||
| {pattern: 'polymer/src/**/*.js', included: false}, | ||
| {pattern: 'polymer/test/**/*.html', included: false}, | ||
| {pattern: 'polymer/test/**/*.css', included: false}, | ||
| {pattern: 'polymer/test/**/*.js', included: false} | ||
| ], | ||
|
|
||
| // list of files to exclude | ||
| exclude: [], | ||
|
|
||
| frameworks: ['mocha'], | ||
|
|
||
| // use dots reporter, as travis terminal does not support escaping sequences | ||
| // possible values: 'dots', 'progress', 'junit', 'teamcity' | ||
| // CLI --reporters progress | ||
| reporters: ['progress'], | ||
|
|
||
| // web server port | ||
| // CLI --port 9876 | ||
| port: 9876, | ||
|
|
||
| // cli runner port | ||
| // CLI --runner-port 9100 | ||
| runnerPort: 9100, | ||
|
|
||
| // enable / disable colors in the output (reporters and logs) | ||
| // CLI --colors --no-colors | ||
| colors: true, | ||
|
|
||
| // level of logging | ||
| // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG | ||
| // CLI --log-level debug | ||
| logLevel: karma.LOG_INFO, | ||
|
|
||
| // enable / disable watching file and executing tests whenever any file changes | ||
| // CLI --auto-watch --no-auto-watch | ||
| autoWatch: true, | ||
|
|
||
| // Start these browsers, currently available: | ||
| // - Chrome | ||
| // - ChromeCanary | ||
| // - Firefox | ||
| // - Opera | ||
| // - Safari (only Mac) | ||
| // - PhantomJS | ||
| // - IE (only Windows) | ||
| // CLI --browsers Chrome,Firefox,Safari | ||
| browsers: ['ChromeCanary'], | ||
|
|
||
| // If browser does not capture in given timeout [ms], kill it | ||
| // CLI --capture-timeout 5000 | ||
| captureTimeout: 50000, | ||
|
|
||
| // Auto run tests on start (when browsers are captured) and exit | ||
| // CLI --single-run --no-single-run | ||
| singleRun: true, | ||
|
|
||
| // report which specs are slower than 500ms | ||
| // CLI --report-slower-than 500 | ||
| reportSlowerThan: 500, | ||
|
|
||
| // compile coffee scripts | ||
| preprocessors: { | ||
| }, | ||
|
|
||
| plugins: [ | ||
| 'karma-mocha', | ||
| 'karma-chrome-launcher', | ||
| 'karma-firefox-launcher', | ||
| 'karma-script-launcher', | ||
| 'karma-crbot-reporter' | ||
| ] | ||
| }); | ||
| }; | ||
|
|
||
| plugins = [ | ||
| 'karma-mocha', | ||
| 'karma-chrome-launcher', | ||
| 'karma-firefox-launcher', | ||
| 'karma-script-launcher', | ||
| 'karma-crbot-reporter' | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.