Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-12 08:36:00 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-06-12 12:12:42 +0300
commit584f8601eff79fe6e400026ba6db086002ce2cba (patch)
treeca092524666d4b7353d766512800b8992359ac2a /features/steps/admin
parent69bbc413fec7aa4168d9ff12df5421674db90032 (diff)
Change `within` to `page.within` in feature steps
Diffstat (limited to 'features/steps/admin')
-rw-r--r--features/steps/admin/applications.rb2
-rw-r--r--features/steps/admin/groups.rb8
-rw-r--r--features/steps/admin/users.rb2
3 files changed, 6 insertions, 6 deletions
diff --git a/features/steps/admin/applications.rb b/features/steps/admin/applications.rb
index e092a4b36c0..7c12cb96921 100644
--- a/features/steps/admin/applications.rb
+++ b/features/steps/admin/applications.rb
@@ -44,7 +44,7 @@ class Spinach::Features::AdminApplications < Spinach::FeatureSteps
end
step 'I click to remove application' do
- within '.oauth-applications' do
+ page.within '.oauth-applications' do
click_on "Destroy"
end
end
diff --git a/features/steps/admin/groups.rb b/features/steps/admin/groups.rb
index 743c3ecce87..9cc74a97c3a 100644
--- a/features/steps/admin/groups.rb
+++ b/features/steps/admin/groups.rb
@@ -38,14 +38,14 @@ class Spinach::Features::AdminGroups < Spinach::FeatureSteps
When 'I select user "John Doe" from user list as "Reporter"' do
select2(user_john.id, from: "#user_ids", multiple: true)
- within "#new_project_member" do
+ page.within "#new_project_member" do
select "Reporter", from: "access_level"
end
click_button "Add users to group"
end
step 'I should see "John Doe" in team list in every project as "Reporter"' do
- within ".group-users-list" do
+ page.within ".group-users-list" do
expect(page).to have_content "John Doe"
expect(page).to have_content "Reporter"
end
@@ -62,13 +62,13 @@ class Spinach::Features::AdminGroups < Spinach::FeatureSteps
end
step 'I remove user "John Doe" from group' do
- within "#user_#{user_john.id}" do
+ page.within "#user_#{user_john.id}" do
click_link 'Remove user from group'
end
end
step 'I should not see "John Doe" in team list' do
- within ".group-users-list" do
+ page.within ".group-users-list" do
expect(page).not_to have_content "John Doe"
end
end
diff --git a/features/steps/admin/users.rb b/features/steps/admin/users.rb
index 8b6bdf219ba..34a3ed9f615 100644
--- a/features/steps/admin/users.rb
+++ b/features/steps/admin/users.rb
@@ -23,7 +23,7 @@ class Spinach::Features::AdminUsers < Spinach::FeatureSteps
end
step 'See username error message' do
- within "#error_explanation" do
+ page.within "#error_explanation" do
expect(page).to have_content "Username"
end
end