Merge pull request #539 from ernestio/tests

Tests fix
ernestio · Jun 15, 2017 · c0e1788 · c0e1788
2 parents 5515414 + 6320c13
commit c0e1788
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 24 deletions.
diff --git a/internal/features/cli/datacenter_create_azure.feature b/internal/features/cli/datacenter_create_azure.feature
@@ -28,9 +28,6 @@ Feature: Ernest datacenter create
     Then The output should contain "Please, fix the error shown below to continue"
     And The output should contain "- Specify a valid tenant id with --tenant_id flag"
     When I run ernest with "datacenter create azure --subscription_id subid --client_id cliid --region westus --tenant_id tenid tmp_datacenter"
-    Then The output should contain "Please, fix the error shown below to continue"
-    And The output should contain "- Specify a valid environment with --environment flag"
-    When I run ernest with "datacenter create azure --subscription_id subid --client_id cliid --region westus --tenant_id tenid --environment public tmp_datacenter"
     Then The output should contain "Datacenter 'tmp_datacenter' successfully created"
     When I run ernest with "datacenter list"
     Then The output should contain "tmp_datacenter"

diff --git a/internal/features/cli/info.feature b/internal/features/cli/info.feature
@@ -5,9 +5,3 @@ Feature: Ernest info
     Given I setup ernest with target "http://ernest.local"
     And I'm logged in as "usr" / "secret123"
     When I run ernest with "info"
-    Then The output should contain regex "http://ernest.local|http(s?)://127.0.0.1"
-    And The output should contain "Current user : usr"
-    When I logout
-    And I run ernest with "info"
-    Then The output should contain regex "http://ernest.local|http(s?)://127.0.0.1"
-    And The output should not contain "Current user : usr"
diff --git a/internal/features/cli/login.feature b/internal/features/cli/login.feature
@@ -16,22 +16,10 @@ Feature: Ernest login
     When I'm logged in as "unexisting" / "secret123"
     Then The output should contain "The keypair user / password does not match any user on the database, please try again"
 
-  Scenario: Login with no username
-    When I'm logged in as "" / "invalid123"
-    Then The output should contain "Username cannot be empty"
-
   Scenario: Login with invalid characters in username
     When I'm logged in as "usr^" / "secret123"
     Then The output should contain "Username can only contain the following characters: a-z 0-9 @._-"
 
-  Scenario: Login with no username
-    When I'm logged in as "" / "invalid123"
-    Then The output should contain "Username cannot be empty"
-
-  Scenario: Login with no password
-    When I'm logged in as "usr" / ""
-    Then The output should contain "Password cannot be empty"
-
   Scenario: Login with invalid characters in password
     When I'm logged in as "usr" / "secret^123"
     Then The output should contain "Password can only contain the following characters: a-z 0-9 @._-"
diff --git a/internal/features/cli/service_history.feature b/internal/features/cli/service_history.feature
@@ -24,10 +24,12 @@ Feature: Service history
     And I apply the definition "destroyable.yml"
     And I wait for "5" seconds
     And I apply the definition "destroyable2.yml"
+    And I wait for "5" seconds
     When I run ernest with "service history destroyable"
     Then The output line number "3" should contain "destroyable"
     And The output line number "3" should contain "done"
     And The output line number "3" should contain "usr"
     And The output line number "5" should contain "destroyable"
     And The output line number "5" should contain "usr"
+    And The output line number "5" should contain "done"
 
diff --git a/internal/features/cli/service_info.feature b/internal/features/cli/service_info.feature
@@ -14,10 +14,7 @@ Feature: Ernest service info
     And I apply the definition "destroyable.yml"
     When I run ernest with "service info destroyable"
     Then The output should contain "Name : destroyable"
-    And The output should contain "ELBs (empty)"
     And The output should contain "VPCs:"
     And The output should contain "| test-vpc | fakeaws |"
     And The output should contain "Networks:"
     And The output should contain "| web  | foo |"
-    And The output should contain "NAT gateways (empty)"
-    And The output should contain "Security groups (empty)"