Commit 51e8796d authored by Tamaki Fujino's avatar Tamaki Fujino Committed by Yas Naoi
Browse files

Issue #3284947 by TamakiFujino, yas, kumikoono: Refactor to use the full path for URL matching

parent cf35fa16

modules/cloud_service_providers/aws_cloud/tests/src/Behat/features/templates/AWS-ATDD-00-02-CreateDrupalResources.feature

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Feature: Create a Drupal role for AWS as "Administrator" 
    And I press "Save"

    Then I should be on "/admin/people/roles"

    And I should see "{{ role_name }}"

    And I visit "admin/people/permissions/{{ role_name_machine }}"

    And I visit "/admin/people/permissions/{{ role_name_machine }}"

    # Allow to see the cloud service provider

    And I check the box "Access {{ cloud_service_provider_name }}"

    # Allow to launch an instance.

modules/cloud_service_providers/aws_cloud/tests/src/Behat/features/templates/AWS-ATDD-02-03-ApproveLaunchInstances.feature

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Feature: Approve of launching an EC2 instance as "Cloud administrator" 
    And I click "{{ instance_name }}"

    And I should see the heading "{{ instance_name }}"

    And I click "Approve"

    And the url should match "/approve"

    And the url should match "/clouds/design/server_template/{{ cloud_context }}/approve"

    And I press "Approve"

    And I wait for AJAX to finish

    Then the url should match "/clouds/design/server_template/{{ cloud_context }}/"

modules/cloud_service_providers/aws_cloud/tests/src/Behat/features/templates/AWS-ATDD-03-01-OperateElasticIPs.feature

+6 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Feature: Allocate and release an Elastic IP as "Authenticated User" 
    And I should see the button "Attach"

    And I wait {{ wait }} milliseconds

    And I click "{{ internet_gateway }}"

    And the url should match "/internet_gateway/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/internet_gateway/"

    And I click "Attach"

    And the url should match "/attach"

    And I select "{{ vpc_name }}" from "VPC CIDR (ID)"
@@ -57,7 +57,7 @@ Feature: Allocate and release an Elastic IP as "Authenticated User" 
    And I should see the link "{{ elastic_ip }}"

    And I wait {{ wait }} milliseconds

    And I click "{{ elastic_ip }}"

    And the url should match "/elastic_ip/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context}}/elastic_ip/"

    And I click "Associate Elastic IP" in the "actions"

    And the url should match "/associate"

    And I select "{{ resource_type }}" from "Resource type"
@@ -77,7 +77,7 @@ Feature: Allocate and release an Elastic IP as "Authenticated User" 
    And I should see the link "{{ elastic_ip }}"

    And I wait {{ wait }} milliseconds

    And I click "{{ elastic_ip}}"

    And the url should match "/elastic_ip/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/elastic_ip/"

    And I click "Disassociate Elastic IP" in the "actions"

    And the url should match "/disassociate"

    And I press "Disassociate Address"
@@ -94,7 +94,7 @@ Feature: Allocate and release an Elastic IP as "Authenticated User" 
    And I should see the link "{{ elastic_ip }}"

    And I wait {{ wait }} milliseconds

    And I click "{{ elastic_ip }}"

    And the url should match "/elastic_ip/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/elastic_ip/"

    And I click "Delete" in the "actions"

    And the url should match "/delete"

    And I press "Delete"
@@ -114,7 +114,7 @@ Feature: Allocate and release an Elastic IP as "Authenticated User" 
    And I should see the button "Detach"

    And I wait {{ wait }} milliseconds

    And I click "{{ internet_gateway }}"

    And the url should match "/internet_gateway/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/internet_gateway/"

    And I click "Detach"

    And the url should match "/detach"

    And I should see "Internet gateway information"
@@ -135,7 +135,7 @@ Feature: Allocate and release an Elastic IP as "Authenticated User" 
    And I should see the button "Attach"

    And I wait {{ wait }} milliseconds

    And I click "{{ internet_gateway }}"

    And the url should match "/internet_gateway/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/internet_gateway/"

    And I click "Delete"

    And the url should match "/delete"

    And I press "Delete"

modules/cloud_service_providers/aws_cloud/tests/src/Behat/features/templates/AWS-ATDD-03-02-OperateVolumes.feature

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Feature: Create and delete a volume as "Authenticated User" 
    And I should see the link "{{ volume_name }}"

    And I should see "available" in the "{{ volume_name }}" row

    And I click "{{ volume_name }}"

    And the url should match "/volume/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/volume/"

    And I click "Attach"

    And the url should match "/attach"

    And I enter "{{ device_name }}" for "Device Name"
@@ -48,7 +48,7 @@ Feature: Create and delete a volume as "Authenticated User" 
    And I should see the link "{{ volume_name }}"

    And I should see "in-use" in the "{{ volume_name }}" row

    And I click "{{ volume_name }}"

    And the url should match "/volume/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/volume/"

    And I click "Detach"

    And the url should match "/detach"

    And I press "Detach"
@@ -66,7 +66,7 @@ Feature: Create and delete a volume as "Authenticated User" 
    And I should see the link "{{ volume_name }}"

    And I should see "available" in the "{{ volume_name }}" row

    And I click "{{ volume_name }}"

    And the url should match "/volume/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/volume/"

    And I click "Delete" in the "actions"

    And the url should match "/delete"

    And I press "Delete"

modules/cloud_service_providers/aws_cloud/tests/src/Behat/features/templates/AWS-ATDD-03-03-OperateSecurityGroups.feature

+8 −8
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Feature: Copying/editing a security group as "Authenticated User" 
    And I should see "{{ security_group_name_to_copy }}" in the "{{ vpc_name_1 }}" row

    And I wait {{ wait }} milliseconds

    And I click "{{ security_group_name_to_copy }}"

    And the url should match "/security_group/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/security_group/"

    And I click "Copy" in the "actions"

    And the url should match "/copy"

    And I enter "{{ security_group_name_copied }}" for "Security group name"
@@ -64,7 +64,7 @@ Feature: Copying/editing a security group as "Authenticated User" 
    And I should see "{{ vpc_name }}" in the "{{ security_group_name_copied }}" row

    And I wait {{ wait }} milliseconds

    And I click "{{ security_group_name_copied }}"

    And the url should match "/security_group/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/security_group/"

    And I should see neither error nor warning messages

    And I should see "{{ security_group_name_copied }}"

    And I should see "{{ description }}"
@@ -83,7 +83,7 @@ Feature: Copying/editing a security group as "Authenticated User" 
    And I should see the link "{{ instance_name }}"

    And I wait {{wait}} milliseconds

    And I click "{{ instance_name }}"

    And the url should match "/instance/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/instance/"

    And I should not see the link "{{ security_group_name_copied }}"

    And I should see the link "{{ security_group_name }}"

    And I click "Edit" in the "actions"
@@ -107,7 +107,7 @@ Feature: Copying/editing a security group as "Authenticated User" 
    And I should see the link "{{ instance_name }}"

    And I wait {{ wait }} milliseconds

    And I click "{{ instance_name }}"

    And the url should match "/instance/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/instance/"

    And I should see the link "{{ security_group_name_copied }}"

    And I should see the link "{{ security_group_name }}"

    And I click "Edit" in the "actions"
@@ -131,7 +131,7 @@ Feature: Copying/editing a security group as "Authenticated User" 
    And I should see the link "{{ security_group_name_copied }}"

    And I wait {{ wait }} milliseconds

    And I click "{{ security_group_name_copied }}"

    And the url should match "/security_group/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/security_group/"

    And I click "Edit" in the "actions"

    And the url should match "/edit"

    # Add a rule to inbound_rules
@@ -166,7 +166,7 @@ Feature: Copying/editing a security group as "Authenticated User" 
    And I should see the link "{{ security_group_name_copied }}"

    And I wait {{ wait }} milliseconds

    And I click "{{ security_group_name_copied }}"

    And the url should match "/security_group/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/security_group/"

    # Confirm default rule in outbound_rules

    And I should see "0.0.0.0/0" in the "outbound_rules"

    And I click "Edit" in the "actions"
@@ -194,7 +194,7 @@ Feature: Copying/editing a security group as "Authenticated User" 
    And I check the box in the "{{ security_group_name_copied }}" row

    And I select "Delete security group(s)" from "Action"

    And I press "Apply to selected items"

    And the url should match "/delete_multiple"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/security_group/delete_multiple"

    And I should see the text "{{ security_group_name_to_copy }}"

    And I should see the text "{{ security_group_name_copied }}"

    And I press "Delete"
@@ -215,7 +215,7 @@ Feature: Copying/editing a security group as "Authenticated User" 
    And I should see the link "{{ vpc_name_1 }}"

    And I wait {{ wait }} milliseconds

    And I click "{{ vpc_name_1 }}"

    And the url should match "/vpc/"

    And the url should match "/clouds/aws_cloud/{{ cloud_context }}/vpc/"

    And I click "Delete" in the "actions"

    And the url should match "/delete"

    And I press "Delete"