-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 0-1-stable
Conflicts: README.md
- Loading branch information
Showing
18 changed files
with
486 additions
and
240 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 +1,3 @@ | ||
| /nbproject/private/ | ||
| /nbproject/private/ | ||
| /node_modules/ | ||
| /coverage/ |
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 +1,12 @@ | ||
| script: phantomjs test/phantomRunner.js test/index.html | ||
| language: node_js | ||
| node_js: | ||
| - '0.11' | ||
| - '0.10' | ||
| - '0.8' | ||
| deploy: | ||
| provider: npm | ||
| api_key: | ||
| secure: iHcy2J1AKnPb/LzaGCIr6ziELKqXL4jPTmGpgQfzng79bsfDIi7QhSXL6IANzlqswU/VKB2eUrFBlvEC/MJ5YmbdovzX+uELexhp5GCeOBv3lSJQWVgFU3NKFM6vje4iBcBjqUg+IG4gZs0NI17YWd9zfDAY9AKvl2UoCEo9R18= | ||
| on: | ||
| tags: true | ||
| node: 0.10 |
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 |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| // Karma configuration | ||
| // Generated on Tue Apr 01 2014 17:31:44 GMT+0200 (CEST) | ||
|
|
||
| module.exports = function(config) { | ||
| config.set({ | ||
|
|
||
| // base path that will be used to resolve all patterns (eg. files, exclude) | ||
| basePath: './', | ||
|
|
||
|
|
||
| // frameworks to use | ||
| // available frameworks: https://npmjs.org/browse/keyword/karma-adapter | ||
| frameworks: ['jasmine', 'requirejs'], | ||
|
|
||
|
|
||
| // list of files / patterns to load in the browser | ||
| files: [ | ||
| 'test-main.js', | ||
| {pattern: '*.js', included: false}, | ||
| {pattern: 'test/**/*Spec.js', included: false} | ||
| ], | ||
|
|
||
|
|
||
| // list of files to exclude | ||
| exclude: [ | ||
| '.git', 'node_modules' | ||
| ], | ||
|
|
||
|
|
||
| // preprocess matching files before serving them to the browser | ||
| // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor | ||
| preprocessors: { | ||
| // source files, that you wanna generate coverage for | ||
| // do not include tests or libraries | ||
| // (these files will be instrumented by Istanbul via Ibrik) | ||
| 'measurement.js': ['jshint','coverage'] | ||
| }, | ||
|
|
||
| // test results reporter to use | ||
| // possible values: 'dots', 'progress' | ||
| // available reporters: https://npmjs.org/browse/keyword/karma-reporter | ||
| reporters: ['coverage', 'progress'], | ||
|
|
||
| // web server port | ||
| port: 9876, | ||
|
|
||
| // enable / disable colors in the output (reporters and logs) | ||
| colors: true, | ||
|
|
||
| // level of logging | ||
| // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG | ||
| logLevel: config.LOG_INFO, | ||
|
|
||
| // enable / disable watching file and executing tests whenever any file changes | ||
| autoWatch: true, | ||
|
|
||
| // start these browsers | ||
| // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher | ||
| browsers: ['PhantomJS'], | ||
|
|
||
| // Continuous Integration mode | ||
| // if true, Karma captures browsers, runs the tests and exits | ||
| singleRun: true, | ||
|
|
||
| // options for karma-jshint | ||
| jshint: { | ||
| options: { | ||
| curly: true, | ||
| eqeqeq: true, | ||
| immed: true, | ||
| latedef: true, | ||
| newcap: true, | ||
| noarg: true, | ||
| sub: true, | ||
| undef: true, | ||
| boss: true, | ||
| devel: true, | ||
| eqnull: true, | ||
| browser: true, | ||
| globals: { | ||
| cordova: true, | ||
| jQuery: true | ||
| } | ||
| }, | ||
| summary: true | ||
| }, | ||
|
|
||
| coverageReporter: { | ||
| dir : './coverage/', | ||
| reporters:[ | ||
| {type: 'lcov'}, | ||
| {type: 'text', file: 'coverage.txt'}, | ||
| {type: 'text-summary', file: 'coverage-summary.txt'} | ||
| ] | ||
| } | ||
| }); | ||
| }; |
Oops, something went wrong.