You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by as...@apache.org on 2013/09/21 15:44:08 UTC
svn commit: r1525237 - in /incubator/devicemap/trunk/browsermap/trunk: ./
Gruntfile.js package.json src/test/karma.conf.js
Author: asavory
Date: Sat Sep 21 13:44:07 2013
New Revision: 1525237
URL: http://svn.apache.org/r1525237
Log:
DMAP-28 - make grunt test work again
* Update karma.conf.js to latest format.
* Update list of npm modules.
* Switch test to use firefox as phantomjs is hanging.
* Tell svn to ignore target and node_modules
Modified:
incubator/devicemap/trunk/browsermap/trunk/ (props changed)
incubator/devicemap/trunk/browsermap/trunk/Gruntfile.js
incubator/devicemap/trunk/browsermap/trunk/package.json
incubator/devicemap/trunk/browsermap/trunk/src/test/karma.conf.js
Propchange: incubator/devicemap/trunk/browsermap/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Sep 21 13:44:07 2013
@@ -0,0 +1,2 @@
+target
+node_modules
Modified: incubator/devicemap/trunk/browsermap/trunk/Gruntfile.js
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/browsermap/trunk/Gruntfile.js?rev=1525237&r1=1525236&r2=1525237&view=diff
==============================================================================
--- incubator/devicemap/trunk/browsermap/trunk/Gruntfile.js (original)
+++ incubator/devicemap/trunk/browsermap/trunk/Gruntfile.js Sat Sep 21 13:44:07 2013
@@ -29,7 +29,7 @@ module.exports = function (grunt) {
continuous: {
configFile: 'src/test/karma.conf.js',
singleRun: true,
- browsers: ['PhantomJS']
+ browsers: ['Firefox']
}
},
jshint: {
Modified: incubator/devicemap/trunk/browsermap/trunk/package.json
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/browsermap/trunk/package.json?rev=1525237&r1=1525236&r2=1525237&view=diff
==============================================================================
--- incubator/devicemap/trunk/browsermap/trunk/package.json (original)
+++ incubator/devicemap/trunk/browsermap/trunk/package.json Sat Sep 21 13:44:07 2013
@@ -19,14 +19,20 @@
},
"readmeFilename": "README.md",
"devDependencies": {
- "grunt": "0.4.0",
- "grunt-karma": "0.4.4",
- "grunt-contrib-jshint": "0.1.1",
- "grunt-contrib-clean": "0.4.0",
- "grunt-contrib-uglify": "0.1.1",
- "grunt-jsdoc": "0.2.3",
- "grunt-contrib-copy": "0.4.0",
- "grunt-contrib-compress": "0.4.0",
- "grunt-qunit-cov": "git+https://raducotescu@github.com/raducotescu/grunt-qunit-cov.git"
+ "grunt": "~0.4.1",
+ "grunt-karma": "~0.6.2",
+ "grunt-contrib-jshint": "~0.6.4",
+ "grunt-contrib-clean": "~0.5.0",
+ "grunt-contrib-uglify": "~0.2.4",
+ "grunt-jsdoc": "~0.4.1",
+ "grunt-contrib-copy": "~0.4.1",
+ "grunt-contrib-compress": "~0.5.2",
+ "grunt-qunit-cov": "~0.3.4",
+ "karma-junit-reporter": "~0.1.0",
+ "karma-qunit": "~0.1.1",
+ "karma": "~0.10.2",
+ "jscoverage": "~0.3.8",
+ "grunt-cli": "~0.1.9",
+ "karma-phantomjs-launcher": "~0.1.0"
}
}
Modified: incubator/devicemap/trunk/browsermap/trunk/src/test/karma.conf.js
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/browsermap/trunk/src/test/karma.conf.js?rev=1525237&r1=1525236&r2=1525237&view=diff
==============================================================================
--- incubator/devicemap/trunk/browsermap/trunk/src/test/karma.conf.js (original)
+++ incubator/devicemap/trunk/browsermap/trunk/src/test/karma.conf.js Sat Sep 21 13:44:07 2013
@@ -18,17 +18,13 @@
*/
// Testacular configuration
-// Generated on Fri Jan 25 2013 15:43:08 GMT+0200 (EET)
-
-
-// base path, that will be used to resolve files and exclude
-basePath = '../../';
-
-
-// list of files / patterns to load in the browser
-files = [
- QUNIT,
- QUNIT_ADAPTER,
+module.exports = function(config) {
+ config.set({
+ // base path, that will be used to resolve files and exclude
+ basePath: '../../',
+ frameworks: ['qunit'],
+ // list of files / patterns to load in the browser
+ files: [
'src/main/js/bmaputil.js',
'src/main/js/bmap.js',
'src/main/lib/matchMedia/matchMedia.js',
@@ -36,62 +32,51 @@ files = [
'src/main/js/probes.js',
'src/main/js/devicegroups.js',
'src/test/js/*.js'
-];
-
-
-// list of files to exclude
-exclude = [
-
-];
-
-
-// test results reporter to use
-// possible values: 'dots', 'progress', 'junit'
-reporters = ['progress', 'junit'];
-junitReporter = {
- outputFile: 'target/test-results.xml'
-}
-
-// web server port
-port = 8080;
-
-
-// cli runner port
-runnerPort = 9100;
-
-
-// enable / disable colors in the output (reporters and logs)
-colors = true;
-
-
-// level of logging
-// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-logLevel = LOG_INFO;
+ ],
+ exclude: [ ],
+ reporters: ['progress', 'junit'],
+ // test results reporter to use
+ // possible values: 'dots', 'progress', 'junit'
+ junitReporter: {
+ outputFile: 'target/test-results.xml'
+ },
+ // web server port
+ port: 8080,
+ // cli runner port
+ runnerPort: 9100,
+ // Start these browsers, currently available:
+ // - Chrome
+ // - ChromeCanary
+ // - Firefox
+ // - Opera
+ // - Safari (only Mac)
+ // - PhantomJS
+ // - IE (only Windows)
+ browsers: ['Chrome', 'ChromeCanary', 'Firefox'],
+ // If browser does not capture in given timeout [ms], kill it
+ captureTimeout: 30000,
+ // enable / disable colors in the output (reporters and logs)
+ colors: true,
+ // level of logging
+ // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
+ logLevel: config.LOG_INFO,
+ // enable / disable watching file and executing tests whenever any file changes
+ autoWatch: false,
+ // Continuous Integration mode
+ // if true, it capture browsers, run tests and exit
+ singleRun: false,
+ // report which specs are slower than 500ms
+ // CLI --report-slower-than 500
+ reportSlowerThan: 500,
+ //...
+ });
+};
-// enable / disable watching file and executing tests whenever any file changes
-autoWatch = false;
-// Start these browsers, currently available:
-// - Chrome
-// - ChromeCanary
-// - Firefox
-// - Opera
-// - Safari (only Mac)
-// - PhantomJS
-// - IE (only Windows)
-browsers = ['Chrome', 'ChromeCanary', 'Firefox'];
-// If browser does not capture in given timeout [ms], kill it
-captureTimeout = 30000;
-// Continuous Integration mode
-// if true, it capture browsers, run tests and exit
-singleRun = false;
-// report which specs are slower than 500ms
-// CLI --report-slower-than 500
-reportSlowerThan = 500;