Skip to content

Commit 724df35

Browse files
Portugal, Marcelomportuga
Portugal, Marcelo
authored andcommitted
fix(protractor): Fixing npm so protractor can be installed and run locally.
1 parent 5bf9400 commit 724df35

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

misc/tutorial/110_grid_in_modal.ngdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ In a sense this is similar to what the auto-resize feature does, but it only doe
8383
}
8484
</file>
8585
<file name="scenario.js">
86-
// TODO: Fix this test. Commenting out because it is causing other tests to fail
86+
// TODO: Fix this test. It is currently causing other tests to fail.
8787
/*var gridTestUtils = require('../../test/e2e/gridTestUtils.spec.js');
8888
var GridObjectTest = require('../../test/e2e/gridObjectTestUtils.spec.js');
8989
var grid1 = new GridObjectTest('grid1');

misc/tutorial/122_accessibility.ngdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ You can visualize the accessibility roles that have been applied to the grid usi
245245
it('should move the focus to the nearest header button unless there is no column then should move to the grid menu', function(){
246246
function hideColCheckFocusedCol(colNum, focusedNumb){
247247
return grid1.clickColumnMenuHide(colNum).then(function(){
248-
var gridMenuButton = grid1.headerCell(focusedNumb).element( by.css( '.ui-grid-header-cell-primary-focus:focus' ));
248+
var gridMenuButton = grid1.headerCell(focusedNumb).element( by.css( '.ui-grid-header-cell-primary-focus' ));
249249
return expectToBeFocused(gridMenuButton);
250250
});
251251
};

package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
},
88
"main": "index.js",
99
"scripts": {
10+
"postinstall": "grunt shell:protractor-install",
1011
"init": "validate-commit-msg",
1112
"test": "grunt",
1213
"commit": "git-cz"
@@ -37,7 +38,6 @@
3738
"canonical-path": "0.0.2",
3839
"coveralls": "^2.11.1",
3940
"cz-conventional-changelog": "^1.1.5",
40-
"ghooks": "^1.0.3",
4141
"grunt": "~0.4",
4242
"grunt-angular-templates": "~0.5",
4343
"grunt-bump": "^0.7.0",
@@ -56,8 +56,9 @@
5656
"grunt-karma": "~0.8",
5757
"grunt-newer": "~1.1.0",
5858
"grunt-ngdocs": "https://github.com/c0bra/grunt-ngdocs/tarball/0.2.7-custom3",
59-
"grunt-protractor-runner": "~4.0.0",
59+
"grunt-protractor-runner": "4.0.0",
6060
"grunt-shell-spawn": "~0.3.0",
61+
"husky": "^0.13.2",
6162
"jit-grunt": "^0.8.0",
6263
"jshint-stylish": "^0.2.0",
6364
"karma": "~0.12",
@@ -75,6 +76,8 @@
7576
"phantomjs-prebuilt": "^2.1.4",
7677
"protractor": "~4.0.14",
7778
"protractor-accessibility-plugin": "^0.3.0",
79+
"requirejs": "^2.3.3",
80+
"selenium-server-standalone-jar": "2.45.0",
7881
"selenium-webdriver": "~2.53.0",
7982
"semver": "~2.2.1",
8083
"shelljs": "~0.2.6",

test/protractor.ci.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ exports.config = {
33
// The address of a running selenium server.
44

55
//seleniumAddress: 'http://localhost:4444/wd/hub',
6-
seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
6+
seleniumServerJar: '../node_modules/selenium-server-standalone-jar/jar/selenium-server-standalone-2.45.0.jar',
77
// seleniumPort: 4444,
88

99
specs: ['../.tmp/doc-scenarios/**/*.spec.js', 'e2e/**/*.spec.js'],

test/protractor.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ exports.config = {
33
// The address of a running selenium server.
44

55
//seleniumAddress: 'http://localhost:4444/wd/hub',
6-
seleniumServerJar: '../node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
6+
seleniumServerJar: '../node_modules/selenium-server-standalone-jar/jar/selenium-server-standalone-2.45.0.jar',
77
seleniumPort: 4444,
88

99
specs: ['../.tmp/doc-scenarios/**/*.spec.js', 'e2e/**/*.spec.js'],

0 commit comments

Comments
 (0)