Skip to content

Commit a5cb511

Browse files
author
Carlos Atencio
committed
Dependencies updates
1 parent b75e9b3 commit a5cb511

File tree

5 files changed

+26
-24
lines changed

5 files changed

+26
-24
lines changed

.jshintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"strict": true,
1919
"trailing": true,
2020
"smarttabs": true,
21+
"loopfunc": true,
2122
"globals": {
2223
"angular": false,
2324
"protractor": false,

Gruntfile.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ module.exports = function(grunt) {
88
},
99
files: ['lib/**/*.js']
1010
},
11-
jasmine_node: {
12-
options: {
13-
forceExit: true,
14-
specNameMatcher: '.specs',
15-
},
16-
all: ['specs/']
11+
jasmine_nodejs: {
12+
all: {
13+
specs: ['specs/*.js']
14+
}
1715
},
1816
connect: {
1917
example: {
@@ -64,17 +62,17 @@ module.exports = function(grunt) {
6462
});
6563

6664
grunt.loadNpmTasks('grunt-contrib-jshint');
67-
grunt.loadNpmTasks('grunt-jasmine-node');
65+
grunt.loadNpmTasks('grunt-jasmine-nodejs');
6866
grunt.loadNpmTasks('grunt-contrib-connect');
6967
grunt.loadNpmTasks('grunt-protractor-runner');
7068
grunt.loadNpmTasks('grunt-browserify');
7169
grunt.loadNpmTasks('grunt-contrib-jasmine');
7270

7371
grunt.registerTask('host-example', ['connect:example:keepalive']);
7472
grunt.registerTask('example', ['connect:example', 'protractor:example']);
75-
grunt.registerTask('test', ['jasmine_node']);
73+
grunt.registerTask('test', ['jasmine_nodejs']);
7674
grunt.registerTask('lint', ['jshint']);
7775
grunt.registerTask('client-test', ['browserify:test', 'jasmine:test']);
7876

79-
grunt.registerTask('verify', ['test', 'client-test', 'example']);
77+
grunt.registerTask('verify', ['lint', 'test', 'client-test', 'example']);
8078
};

lib/initData.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ function getConfig(){
99
var config = defaultConfig;
1010

1111
if(module.exports.config){
12-
config.rootDirectory = module.exports.config['rootDirectory'] || config.module.rootDirectory;
12+
config.rootDirectory = module.exports.config.rootDirectory || config.module.rootDirectory;
1313
}
1414

15-
var protractorConfigFile = path.join(config.rootDirectory, module.exports.config['protractorConfig'] || config.protractorConfig);
15+
var protractorConfigFile = path.join(config.rootDirectory, module.exports.config.protractorConfig || config.protractorConfig);
1616
var protractorConfig = require(protractorConfigFile).config;
1717

1818
config.mocks = protractorConfig.mocks || defaultConfig.mocks;
@@ -80,11 +80,11 @@ function getProtractorInstance(){
8080
}
8181

8282
module.exports = function(mocks, plugins, skipDefaults){
83-
var mocks = buildMocks(mocks, skipDefaults),
84-
plugins = buildPlugins(plugins);
83+
var builtMocks = buildMocks(mocks, skipDefaults),
84+
builtPlugins = buildPlugins(plugins);
8585

8686
var ptor = getProtractorInstance();
87-
ptor.addMockModule('httpMock', httpMock(mocks, plugins));
87+
ptor.addMockModule('httpMock', httpMock(builtMocks, builtPlugins));
8888
};
8989

9090
module.exports.teardown = function(){

package.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,29 @@
66
"scripts": {
77
"example": "grunt example",
88
"test": "node_modules/.bin/grunt verify",
9-
"webdriver-update": "node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update"
9+
"webdriver-update": "node node_modules/grunt-protractor-runner/scripts/webdriver-manager-update"
1010
},
1111
"author": "Carlos Atencio",
1212
"license": "BSD-2-Clause",
1313
"devDependencies": {
14-
"grunt": "~0.4.5",
15-
"grunt-browserify": "^3.8.0",
16-
"grunt-contrib-connect": "^0.8.0",
17-
"grunt-contrib-jasmine": "^0.8.2",
18-
"grunt-contrib-jshint": "~0.10.0",
19-
"grunt-jasmine-node": "~0.2.1",
20-
"grunt-protractor-runner": "^1.1.4",
21-
"phantomjs-prebuilt": "2.1.3",
14+
"grunt": "~1.0.1",
15+
"grunt-browserify": "^5.0.0",
16+
"grunt-contrib-connect": "^1.0.2",
17+
"grunt-contrib-jasmine": "^1.0.3",
18+
"grunt-contrib-jshint": "~1.0.0",
19+
"grunt-jasmine-nodejs": "^1.5.2",
20+
"grunt-protractor-runner": "^3.1.0",
21+
"phantomjs-prebuilt": "^2.1.3",
2222
"protractor-http-mock-sample-plugin": "0.0.1"
2323
},
2424
"repository": {
2525
"type": "git",
2626
"url": "https://github.com/atecarlos/protractor-http-mock"
2727
},
2828
"dependencies": {
29-
"query-string": "^1.0.0"
29+
"query-string": "^4.1.0"
30+
},
31+
"engines": {
32+
"node": ">=0.10.0"
3033
}
3134
}
File renamed without changes.

0 commit comments

Comments
 (0)