Fix tests after deps update

kubernetes · Mar 22, 2016 · 2bfe1d4 · 2bfe1d4
1 parent 493ed42
commit 2bfe1d4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/src/app/frontend/deploy/deploy.html b/src/app/frontend/deploy/deploy.html
@@ -45,12 +45,11 @@ <h3 class="md-headline kd-deploy-form-title">Deploy a Containerized App</h3>
         </deploy-from-file>
       </div>
 
-      <md-button class="md-raised md-primary kd-deploy-btn" type="submit"
+      <md-button class="md-raised md-primary kd-deploy-submit-button" type="submit"
                  ng-disabled="ctrl.isDeployDisabled()">
         Deploy
       </md-button>
-      <md-button class="md-raised" ng-click="ctrl.cancel()">Cancel</md-button>
-
+      <md-button class="md-raised kd-deploy-cancel-button" ng-click="ctrl.cancel()">Cancel</md-button>
     </form>
   </md-whiteframe>
 </div>
diff --git a/src/test/integration/deploy/deploy_po.js b/src/test/integration/deploy/deploy_po.js
@@ -14,7 +14,7 @@
 
 export default class DeployPageObject {
   constructor() {
-    this.deployButtonQuery = by.css('.kd-deploy-btn');
+    this.deployButtonQuery = by.css('.kd-deploy-submit-button');
     this.deployButton = element(this.deployButtonQuery);
 
     this.appNameFieldQuery = by.model('ctrl.name');

diff --git a/src/test/integration/deploy/deployfromfile_po.js b/src/test/integration/deploy/deployfromfile_po.js
@@ -17,10 +17,10 @@ export default class DeployFromFilePageObject {
     this.deployFromFileRadioButtonQuery = by.xpath('//md-radio-button[@value="File"]');
     this.deployFromFileRadioButton = element(this.deployFromFileRadioButtonQuery);
 
-    this.deployButtonQuery = by.xpath('//button[@type="submit"]');
+    this.deployButtonQuery = by.css('.kd-deploy-submit-button');
     this.deployButton = element(this.deployButtonQuery);
 
-    this.cancelButtonQuery = by.xpath('//button[@ng-click="ctrl.cancel()"]');
+    this.cancelButtonQuery = by.css('.kd-deploy-cancel-button');
     this.cancelButton = element(this.cancelButtonQuery);
 
     this.inputContainerQuery = by.tagName('md-input-container');

diff --git a/src/test/integration/deploy/deployfromfile_test.js b/src/test/integration/deploy/deployfromfile_test.js
@@ -44,7 +44,7 @@ describe('Deploy from file view', () => {
     page.cancelButton.click();
 
     // then
-    expect(zeroState.deployButton.isPresent()).toBeTruthy();
+    expect(zeroState.deployButton.isPresent()).toBe(true);
   });
 
 });
diff --git a/src/test/integration/stories/deploy_not_existing_img_test.js b/src/test/integration/stories/deploy_not_existing_img_test.js
@@ -32,8 +32,7 @@ import ZeroStatePageObject from '../zerostate/zerostate_po';
  *  - [Logs Page] - Check if pod logs show that pod is in pending state.
  *  - Clean up and delete created resources
  */
-// TODO(#494): Reenable this test when fixed.
-xdescribe('Deploy not existing image story', () => {
+describe('Deploy not existing image story', () => {
   /** @type {!ZeroStatePageObject} */
   let zeroStatePage;