Skip to content

Commit

Permalink
Update to intern 1.3.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanforbes committed Nov 25, 2013
1 parent be37e27 commit 3bf09ed
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/templates/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions app/templates/src/app/tests/intern.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))\//
});
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/intern.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)\//
});

0 comments on commit 3bf09ed

Please sign in to comment.