Alberich integration: fix cucumber tests

Author: sseago

src/features/permission.feature

@@ -15,11 +15,11 @@ Feature: Manage Permissions
     And there is not a permission for the user "testuser"
     When I follow "Grant Access"
     Then I should be on the new permission page
-    And I should see "Choose roles for users"
+    And I should see "Choose roles for"
     When I select "Pool User" role for the user "testuser"
     And I press "Grant Access"
     Then I should be on the page for the pool "PermissionPool"
-    And I should see "Added the following User Roles"
+    And I should see "Added the following permission grants"
     And I should see "testuser"
 
   Scenario: Create a second permission on a resource
@@ -28,11 +28,11 @@ Feature: Manage Permissions
     When I follow link with ID "details_permissions"
     When I follow "Grant Access"
     Then I should be on the new permission page
-    And I should see "Choose roles for users"
+    And I should see "Choose roles for Pool"
     When I select "Pool Admin" role for the user "testuser"
     And I press "Grant Access"
     Then I should be on the page for the pool "PermissionPool"
-    And I should see "Added the following User Roles"
+    And I should see "Added the following permission grants"
     And I should see "testuser"
 
   Scenario: Attempt to duplicate a permission
@@ -41,11 +41,11 @@ Feature: Manage Permissions
     When I follow link with ID "details_permissions"
     When I follow "Grant Access"
     Then I should be on the new permission page
-    And I should see "Choose roles for users"
+    And I should see "Choose roles for Pool"
     When I select "Pool User" role for the user "testuser"
     And I press "Grant Access"
     Then I should be on the page for the pool "PermissionPool"
-    And I should see "Could not add these User Roles"
+    And I should see "Could not add the following permission grants"
     And I should see "testuser"
 
   Scenario: Delete a permission
@@ -65,5 +65,5 @@ Feature: Manage Permissions
     When I follow "PermPool"
     When I follow link with ID "details_permissions"
     When I follow "Inherited Access"
-    Then I should see "Inherited From"
+    Then I should see "Inherited from"
     And I should see "PermFamily"

src/features/role.feature

@@ -14,9 +14,9 @@ Feature: Manage Roles
     And there should be a role named "Captain"
     When I follow "Captain"
     And I follow "Edit"
-    Then I should see "Editing Role:"
+    Then I should see "Editing role"
     When I fill in "role[name]" with "Admiral"
-    And I press "Save"
+    And I press "Update Alberich/role"
     Then I should see "Role updated successfully"
 
   Scenario: Show role details
@@ -29,12 +29,10 @@ Feature: Manage Roles
     Given a role "Admiral" exists
     And I am on the roles page
     And there are 2 more roles
-    When I check "Admiral" role
-    And I check "Captain" role
-    And I press "Delete"
+    When I delete the role "Admiral"
+    When I delete the role "Captain"
     Then there should be 0 more roles
     And I should be on the roles page
-    And I should see "These Roles were deleted: Captain, Admiral"
 
 #  Scenario: Search roles
 #    Given a role "Admiral" exists

src/features/step_definitions/permission_steps.rb

@@ -18,7 +18,7 @@
 end
 
 Given /^there is not a permission for the user "([^\"]*)"$/ do |username|
-  Permission.first(:include => ['entity' => ['session_entities' => 'user']], :conditions => ['users.username = ?', username]).should be_nil
+  Alberich::Permission.first(:include => ['entity' => ['session_entities' => 'user']], :conditions => ['users.username = ?', username]).should be_nil
 end
 
 Given /^there is a permission for the user "([^\"]*)"$/ do |username|

src/features/step_definitions/role_steps.rb

@@ -14,47 +14,47 @@
 #   limitations under the License.
 #
 Given /there's no role/ do
-  Role.destroy_all
+  Alberich::Role.destroy_all
 end
 
 Given /there's a list of roles/ do
-  @initial_num_roles = Role.count
+  @initial_num_roles = Alberich::Role.count
 end
 
 Given /^a role "([^"]*)" exists$/ do |role_name|
-  Role.create(:name => role_name, :scope => BasePermissionObject.to_s)
+  Alberich::Role.create(:name => role_name, :scope => Alberich::BasePermissionObject.to_s)
 end
 
 Given /^there should be a role named "([^\"]*)"$/ do |name|
-  Role.find_by_name(name).should_not == nil
+  Alberich::Role.find_by_name(name).should_not == nil
 end
 
 Given /^there are (\d+) roles$/ do |number|
-  Role.count.should == number.to_i
+  Alberich::Role.count.should == number.to_i
 end
 
 Given /^there are (\d+) more roles$/ do |number|
-  Role.count.should == @initial_num_roles + number.to_i
+  Alberich::Role.count.should == @initial_num_roles + number.to_i
 end
 
 Given /^there are (\d+) fewer roles$/ do |number|
-  Role.count.should == @initial_num_roles - number.to_i
-  (@initial_num_roles + Role.count).should == number.to_i
+  Alberich::Role.count.should == @initial_num_roles - number.to_i
+  (@initial_num_roles + Alberich::Role.count).should == number.to_i
 end
 
-When /^(?:|I )check "([^"]*)" role$/ do |role_name|
-  role = Role.find_by_name(role_name)
-  check("role_checkbox_#{role.id}")
+When /^I delete the role "(.*?)"$/ do |role_name|
+  role = Alberich::Role.find_by_name(role_name)
+  click_link("destroy_role_#{role.id}")
 end
 
 Then /^there should only be (\d+) roles$/ do |number|
-  Role.count.should == number.to_i
+  Alberich::Role.count.should == number.to_i
 end
 
 Then /^there should be (\d+) more roles$/ do |number|
-  Role.count.should == @initial_num_roles + number.to_i
+  Alberich::Role.count.should == @initial_num_roles + number.to_i
 end
 
 Then /^there should be (\d+) fewer roles$/ do |number|
-  Role.count.should == (@initial_num_roles - number.to_i)
+  Alberich::Role.count.should == (@initial_num_roles - number.to_i)
 end

src/features/support/paths.rb

@@ -42,7 +42,7 @@ def path_to(page_name)
        user_group_path(UserGroup.find_by_name($1))
 
     when /^(.*)'s role page$/i
-       role_path(Role.find_by_name($1))
+       alberich.role_path(Alberich::Role.find_by_name($1))
 
     when /^(.*)'s frontend realm page$/i
        frontend_realm_path(FrontendRealm.find_by_name($1))
@@ -125,10 +125,13 @@ def path_to(page_name)
       hardware_profiles_pool_path
 
     when /the permissions page/
-      url_for list_permissions_path
+      url_for alberich.list_permissions_path
 
     when /the new permission page/
-      url_for new_permission_path
+      url_for alberich.new_permission_path
+
+    when /the roles page/
+      url_for alberich.roles_path
 
     when /the pool family provider accounts page/
       url_for pool_family_path(@pool_family, :details_tab => 'provider_accounts')