diff --git a/app/templates/_package.json b/app/templates/_package.json index 7305aac..cb5cd9f 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -9,7 +9,7 @@ "grunt-contrib-clean": "~0.5.0",<% if (stylus) { %> "grunt-contrib-watch": "~0.5.3", "grunt-contrib-stylus": "~0.8.0",<% } %> - "intern-geezer": "1.2.1", + "intern-geezer": "~1.3.2", "load-grunt-tasks": "~0.1.0" } } diff --git a/app/templates/src/app/tests/intern.js b/app/templates/src/app/tests/intern.js index 66536e6..ddfe8e8 100644 --- a/app/templates/src/app/tests/intern.js +++ b/app/templates/src/app/tests/intern.js @@ -15,7 +15,7 @@ define({ // Note that the `build` capability will be filled in with the current commit ID from the Travis CI environment // automatically capabilities: { - 'selenium-version': '2.35.0' + 'selenium-version': '2.37.0' }, // Browsers to run integration testing against. Note that version numbers must be strings if used with Sauce @@ -66,5 +66,5 @@ define({ functionalSuites: [ '<%= appname %>/tests/functional' ], // A regular expression matching URLs to files that should not be included in code coverage analysis - excludeInstrumentation: /^tests\// + excludeInstrumentation: /^(?:node_modules|src\/(?:dojo<% if (dijit) { %>|dijit<% } %><% if (dojox) { %>|dojox<% } %><% if (dgrid) { %>|put-selector|xstyle|dgrid<% }%>|<%= appname %>\/tests))\// }); diff --git a/package.json b/package.json index ebad3c5..b77ee78 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,13 @@ "url": "git://github.com/bryanforbes/generator-dojo.git" }, "scripts": { - "test": "node node_modules/intern/client.js config=tests/intern.js" + "test": "./node_modules/.bin/intern-client config=tests/intern" }, "dependencies": { "yeoman-generator": "~0.13.0" }, "devDependencies": { - "intern": "~1.2.1" + "intern": "~1.3.2" }, "peerDependencies": { "yo": ">=1.0.0-rc.1" diff --git a/tests/intern.js b/tests/intern.js index 22cf097..0e1cc09 100644 --- a/tests/intern.js +++ b/tests/intern.js @@ -16,5 +16,5 @@ define({ functionalSuites: [ /* 'myPackage/tests/functional' */ ], // A regular expression matching URLs to files that should not be included in code coverage analysis - excludeInstrumentation: /^tests\// + excludeInstrumentation: /^(node_modules|tests)\// });