Skip to content

Commit

Permalink
fix(protractor): Fixing npm so protractor can be installed and run lo…
Browse files Browse the repository at this point in the history
…cally.
  • Loading branch information
Portugal, Marcelo authored and mportuga committed Mar 16, 2017
1 parent 5bf9400 commit 724df35
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion misc/tutorial/110_grid_in_modal.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ In a sense this is similar to what the auto-resize feature does, but it only doe
}
</file>
<file name="scenario.js">
// TODO: Fix this test. Commenting out because it is causing other tests to fail
// TODO: Fix this test. It is currently causing other tests to fail.
/*var gridTestUtils = require('../../test/e2e/gridTestUtils.spec.js');
var GridObjectTest = require('../../test/e2e/gridObjectTestUtils.spec.js');
var grid1 = new GridObjectTest('grid1');
Expand Down
2 changes: 1 addition & 1 deletion misc/tutorial/122_accessibility.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ You can visualize the accessibility roles that have been applied to the grid usi
it('should move the focus to the nearest header button unless there is no column then should move to the grid menu', function(){
function hideColCheckFocusedCol(colNum, focusedNumb){
return grid1.clickColumnMenuHide(colNum).then(function(){
var gridMenuButton = grid1.headerCell(focusedNumb).element( by.css( '.ui-grid-header-cell-primary-focus:focus' ));
var gridMenuButton = grid1.headerCell(focusedNumb).element( by.css( '.ui-grid-header-cell-primary-focus' ));
return expectToBeFocused(gridMenuButton);
});
};
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
},
"main": "index.js",
"scripts": {
"postinstall": "grunt shell:protractor-install",
"init": "validate-commit-msg",
"test": "grunt",
"commit": "git-cz"
Expand Down Expand Up @@ -37,7 +38,6 @@
"canonical-path": "0.0.2",
"coveralls": "^2.11.1",
"cz-conventional-changelog": "^1.1.5",
"ghooks": "^1.0.3",
"grunt": "~0.4",
"grunt-angular-templates": "~0.5",
"grunt-bump": "^0.7.0",
Expand All @@ -56,8 +56,9 @@
"grunt-karma": "~0.8",
"grunt-newer": "~1.1.0",
"grunt-ngdocs": "https://github.com/c0bra/grunt-ngdocs/tarball/0.2.7-custom3",
"grunt-protractor-runner": "~4.0.0",
"grunt-protractor-runner": "4.0.0",
"grunt-shell-spawn": "~0.3.0",
"husky": "^0.13.2",
"jit-grunt": "^0.8.0",
"jshint-stylish": "^0.2.0",
"karma": "~0.12",
Expand All @@ -75,6 +76,8 @@
"phantomjs-prebuilt": "^2.1.4",
"protractor": "~4.0.14",
"protractor-accessibility-plugin": "^0.3.0",
"requirejs": "^2.3.3",
"selenium-server-standalone-jar": "2.45.0",
"selenium-webdriver": "~2.53.0",
"semver": "~2.2.1",
"shelljs": "~0.2.6",
Expand Down
2 changes: 1 addition & 1 deletion test/protractor.ci.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ exports.config = {
// The address of a running selenium server.

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

specs: ['../.tmp/doc-scenarios/**/*.spec.js', 'e2e/**/*.spec.js'],
Expand Down
2 changes: 1 addition & 1 deletion test/protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ exports.config = {
// The address of a running selenium server.

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

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

0 comments on commit 724df35

Please sign in to comment.