Skip to content

Commit f9e1f9d

Browse files
committed
Merge pull request #554 from kubernetes/greenkeeper-update-all
Update all dependencies 🌴
2 parents ba628bc + 1215f60 commit f9e1f9d

File tree

6 files changed

+24
-25
lines changed

6 files changed

+24
-25
lines changed

.eslintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// Enables all ES6 features except modules.
1313
"es6": true,
1414
},
15-
"ecmaFeatures": {
15+
"parserOptions": {
1616
// Enable ES6 modules to have all language features covered.
17-
"modules": true,
17+
"sourceType": "module"
1818
},
1919
"rules": {
2020
// Require parens in arrow function arguments.

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
},
99
"license": "Apache-2.0",
1010
"devDependencies": {
11-
"babel": "~6.3.26",
11+
"babel": "~6.5.2",
1212
"babel-core": "~6.7.2",
1313
"babel-loader": "~6.2.0",
14-
"babel-preset-es2015": "~6.3.13",
14+
"babel-preset-es2015": "~6.6.0",
1515
"babelify": "~7.2.0",
1616
"bower": "~1.7.1",
1717
"browser-sync": "~2.11.1",
1818
"browser-sync-spa": "~1.0.3",
1919
"browserify": "~13.0.0",
20-
"browserify-istanbul": "~0.2.1",
20+
"browserify-istanbul": "~2.0.0",
2121
"del": "~2.2.0",
22-
"eslint-plugin-angular": "~0.15.0",
23-
"google-closure-compiler": "~20160208.1.0",
22+
"eslint-plugin-angular": "~1.0.0",
23+
"google-closure-compiler": "~20160208.7.0",
2424
"gulp": "~3.9.0",
2525
"gulp-angular-templatecache": "~1.8.0",
2626
"gulp-autoprefixer": "~3.1.0",
@@ -29,29 +29,29 @@
2929
"gulp-closure-compiler": "~0.4.0",
3030
"gulp-codecov.io": "~1.0.1",
3131
"gulp-concat": "~2.6.0",
32-
"gulp-eslint": "~1.1.1",
33-
"gulp-filter": "~3.0.1",
32+
"gulp-eslint": "~2.0.0",
33+
"gulp-filter": "~4.0.0",
3434
"gulp-flatten": "~0.2.0",
3535
"gulp-htmlmin": "^1.3.0",
36-
"gulp-inject": "~3.0.0",
36+
"gulp-inject": "~4.0.0",
3737
"gulp-minify-css": "^1.2.2",
38-
"gulp-protractor": "~2.1.0",
38+
"gulp-protractor": "~2.2.0",
3939
"gulp-rename": "~1.2.2",
4040
"gulp-replace": "~0.5.4",
41-
"gulp-rev": "~6.0.1",
41+
"gulp-rev": "~7.0.0",
4242
"gulp-rev-replace": "~0.4.3",
43-
"gulp-sass": "~2.1.1",
43+
"gulp-sass": "~2.2.0",
4444
"gulp-sass-lint": "^1.1.0",
45-
"gulp-size": "~2.0.0",
45+
"gulp-size": "~2.1.0",
4646
"gulp-sourcemaps": "~1.6.0",
4747
"gulp-uglify": "~1.5.1",
4848
"gulp-useref": "~3.0.4",
4949
"gulp-util": "~3.0.7",
5050
"gulp-watch": "~4.3.5",
5151
"html-minifier": "~1.2.0",
5252
"isparta": "~4.0.0",
53-
"karma": "0.13.19",
54-
"karma-browserify": "~5.0.1",
53+
"karma": "0.13.22",
54+
"karma-browserify": "~5.0.3",
5555
"karma-chrome-launcher": "~0.2.2",
5656
"karma-coverage": "~0.5.3",
5757
"karma-firefox-launcher": "^0.1.7",
@@ -60,7 +60,7 @@
6060
"karma-ng-html2js-preprocessor": "~0.2.0",
6161
"karma-sauce-launcher": "^0.3.0",
6262
"karma-sourcemap-loader": "~0.3.6",
63-
"lodash": "~4.1.0",
63+
"lodash": "~4.6.1",
6464
"npm-check-updates": "^2.5.8",
6565
"proxy-middleware": "~0.15.0",
6666
"q": "~1.4.1",
@@ -69,7 +69,7 @@
6969
"uglify-save-license": "~0.4.1",
7070
"watchify": "^3.7.0",
7171
"webpack-stream": "~3.1.0",
72-
"wiredep": "~3.0.0",
72+
"wiredep": "~4.0.0",
7373
"wrench": "~1.5.8"
7474
},
7575
"engines": {

src/app/frontend/deploy/deploy.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ <h3 class="md-headline kd-deploy-form-title">Deploy a Containerized App</h3>
4545
</deploy-from-file>
4646
</div>
4747

48-
<md-button class="md-raised md-primary kd-deploy-btn" type="submit"
48+
<md-button class="md-raised md-primary kd-deploy-submit-button" type="submit"
4949
ng-disabled="ctrl.isDeployDisabled()">
5050
Deploy
5151
</md-button>
52-
<md-button class="md-raised" ng-click="ctrl.cancel()">Cancel</md-button>
53-
52+
<md-button class="md-raised kd-deploy-cancel-button" ng-click="ctrl.cancel()">Cancel</md-button>
5453
</form>
5554
</md-whiteframe>
5655
</div>

src/test/integration/deploy/deploy_po.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
export default class DeployPageObject {
1616
constructor() {
17-
this.deployButtonQuery = by.css('.kd-deploy-btn');
17+
this.deployButtonQuery = by.css('.kd-deploy-submit-button');
1818
this.deployButton = element(this.deployButtonQuery);
1919

2020
this.appNameFieldQuery = by.model('ctrl.name');

src/test/integration/deploy/deployfromfile_po.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ export default class DeployFromFilePageObject {
1717
this.deployFromFileRadioButtonQuery = by.xpath('//md-radio-button[@value="File"]');
1818
this.deployFromFileRadioButton = element(this.deployFromFileRadioButtonQuery);
1919

20-
this.deployButtonQuery = by.xpath('//button[@type="submit"]');
20+
this.deployButtonQuery = by.css('.kd-deploy-submit-button');
2121
this.deployButton = element(this.deployButtonQuery);
2222

23-
this.cancelButtonQuery = by.xpath('//button[@ng-click="ctrl.cancel()"]');
23+
this.cancelButtonQuery = by.css('.kd-deploy-cancel-button');
2424
this.cancelButton = element(this.cancelButtonQuery);
2525

2626
this.inputContainerQuery = by.tagName('md-input-container');

src/test/integration/deploy/deployfromfile_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('Deploy from file view', () => {
4444
page.cancelButton.click();
4545

4646
// then
47-
expect(zeroState.deployButton.isPresent()).toBeTruthy();
47+
expect(zeroState.deployButton.isPresent()).toBe(true);
4848
});
4949

5050
});

0 commit comments

Comments
 (0)