diff --git a/misc/tutorial/110_grid_in_modal.ngdoc b/misc/tutorial/110_grid_in_modal.ngdoc index 79c022a7a0..85aeaac9eb 100644 --- a/misc/tutorial/110_grid_in_modal.ngdoc +++ b/misc/tutorial/110_grid_in_modal.ngdoc @@ -83,7 +83,7 @@ In a sense this is similar to what the auto-resize feature does, but it only doe } - // 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'); diff --git a/misc/tutorial/122_accessibility.ngdoc b/misc/tutorial/122_accessibility.ngdoc index 091aa44120..98201add81 100644 --- a/misc/tutorial/122_accessibility.ngdoc +++ b/misc/tutorial/122_accessibility.ngdoc @@ -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); }); }; diff --git a/package.json b/package.json index 95399f833e..251bd0a815 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ }, "main": "index.js", "scripts": { + "postinstall": "grunt shell:protractor-install", "init": "validate-commit-msg", "test": "grunt", "commit": "git-cz" @@ -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", @@ -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", @@ -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", diff --git a/test/protractor.ci.conf.js b/test/protractor.ci.conf.js index e284757439..9db8d60506 100644 --- a/test/protractor.ci.conf.js +++ b/test/protractor.ci.conf.js @@ -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'], diff --git a/test/protractor.conf.js b/test/protractor.conf.js index d1de057359..029a412739 100644 --- a/test/protractor.conf.js +++ b/test/protractor.conf.js @@ -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'],