Merge pull request #2809 from dcos/revert-2766-weblancaster/fix/DCOS-…

…20080-disable-review-and-run-button DCOS-21564: Revert "fix(createServiceModal): disabled review and run button"
dcos · Mar 6, 2018 · d5f18f0 · d5f18f0
2 parents 187bb71 + d31147a
commit d5f18f0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 23 deletions.
diff --git a/plugins/services/src/js/components/modals/CreateServiceModal.js b/plugins/services/src/js/components/modals/CreateServiceModal.js
@@ -785,7 +785,6 @@ class CreateServiceModal extends Component {
         {
           className: "button-primary flush-vertical",
           clickHandler: this.handleServiceReview,
-          disabled: this.getAllErrors().length > 0,
           label: "Review & Run"
         }
       ];
@@ -796,7 +795,6 @@ class CreateServiceModal extends Component {
         {
           className: "button-primary flush-vertical",
           clickHandler: this.handleServiceReview,
-          disabled: this.getAllErrors().length > 0,
           label: "Review & Run"
         }
       ];

diff --git a/system-tests/services/test-apps.js b/system-tests/services/test-apps.js
@@ -44,7 +44,7 @@ describe("Services", function() {
       //   .type('{selectall}0.5');
       //
       cy.root().getFormGroupInputFor("Memory (MiB) *").type("{selectall}10");
-      cy.root().getFormGroupInputFor("Command").type(cmdline).blur();
+      cy.root().getFormGroupInputFor("Command").type(cmdline);
 
       // Click Review and Run
       cy
@@ -119,7 +119,7 @@ describe("Services", function() {
         .getFormGroupInputFor("Service ID *")
         .type(`{selectall}{rightarrow}${serviceName}`);
 
-      cy.root().getFormGroupInputFor("Command").type(cmdline).blur();
+      cy.root().getFormGroupInputFor("Command").type(cmdline);
 
       // Check JSON view
       cy.contains("JSON Editor").click();
@@ -1166,7 +1166,7 @@ describe("Services", function() {
         .contains(".dropdown-select-item-title", "Local Persistent Volume")
         .click();
       cy.root().getFormGroupInputFor("Size (MiB)").type("128");
-      cy.root().getFormGroupInputFor("Container Path").type("test").blur();
+      cy.root().getFormGroupInputFor("Container Path").type("test");
 
       // Click Review and Run
       cy

diff --git a/system-tests/services/test-external-volumes.js b/system-tests/services/test-external-volumes.js
@@ -55,7 +55,7 @@ describe("Services", function() {
         .click();
       cy.root().getFormGroupInputFor("Name").type(volumeName);
       cy.root().getFormGroupInputFor("Size (GiB)").type("1");
-      cy.root().getFormGroupInputFor("Container Path").type("test").blur();
+      cy.root().getFormGroupInputFor("Container Path").type("test");
 
       // Click Review and Run
       cy.contains("Review & Run").click();

diff --git a/system-tests/services/test-pods.js b/system-tests/services/test-pods.js
@@ -514,11 +514,7 @@ describe("Services", function() {
 
       cy.root().getFormGroupInputFor("Container Port").type("8080");
 
-      cy
-        .root()
-        .getFormGroupInputFor("Service Endpoint Name")
-        .type("http")
-        .blur();
+      cy.root().getFormGroupInputFor("Service Endpoint Name").type("http");
 
       cy
         .get("button")

diff --git a/tests/pages/services/ServiceFormModal-cy.js b/tests/pages/services/ServiceFormModal-cy.js
@@ -104,15 +104,6 @@ describe("Service Form Modal", function() {
           .first()
           .should("to.have.text", "Networking");
       });
-
-      it("disable review and run button on error", function() {
-        openServiceModal();
-        openServiceJSON();
-
-        cy
-          .get(".modal-full-screen-actions-primary > .button")
-          .should("be.disabled");
-      });
     });
 
     context("Group level", function() {
@@ -1454,8 +1445,7 @@ describe("Service Form Modal", function() {
         cy
           .get('.form-control[name="container.docker.image"]')
           .clear()
-          .type("nginx")
-          .blur();
+          .type("nginx");
 
         // Click review and run
         cy
@@ -1697,7 +1687,7 @@ describe("Service Form Modal", function() {
     it("Should show network form when clicking on Network Configuration Edit", function() {
       cy.get(".menu-tabbed-item").contains("Networking").click();
       cy.get(".menu-tabbed-view .button.button-primary-link").first().click();
-      cy.get('input[name="containers.0.endpoints.0.name"]').type("test").blur();
+      cy.get('input[name="containers.0.endpoints.0.name"]').type("test");
       // Click review and run
       cy
         .get(".modal-full-screen-actions")