summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorMike Greiling <mgreiling@gitlab.com>2017-08-04 18:56:49 +0000
committerMike Greiling <mgreiling@gitlab.com>2017-08-04 18:56:49 +0000
commit17342953dd8d98e85ea79025ffd93a051f786413 (patch)
treea28255033baa6fad2267990658840c97a3f03df9 /features
parent017550d482b0035dbec3ae93f8b0c73839772464 (diff)
parent6ec561a2f7384e6de59821fa4bcd5b63f605cb51 (diff)
downloadgitlab-ce-17342953dd8d98e85ea79025ffd93a051f786413.tar.gz
Merge branch '34060-simplified-general-project-settings' into 'master'
34060 Simply general project settings to use expanded panels Closes #34060 See merge request !12620
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/project.rb16
-rw-r--r--features/steps/shared/project.rb2
2 files changed, 13 insertions, 5 deletions
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index 170e2f16c80..0a89c1baf20 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -10,7 +10,9 @@ class Spinach::Features::Project < Spinach::FeatureSteps
end
step 'I save project' do
- click_button 'Save changes'
+ page.within '.general-settings' do
+ click_button 'Save changes'
+ end
end
step 'I should see project with new settings' do
@@ -31,7 +33,9 @@ class Spinach::Features::Project < Spinach::FeatureSteps
:project_avatar,
File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
)
- click_button 'Save changes'
+ page.within '.general-settings' do
+ click_button 'Save changes'
+ end
@project.reload
end
@@ -50,7 +54,9 @@ class Spinach::Features::Project < Spinach::FeatureSteps
:project_avatar,
File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif')
)
- click_button 'Save changes'
+ page.within '.general-settings' do
+ click_button 'Save changes'
+ end
@project.reload
end
@@ -69,7 +75,9 @@ class Spinach::Features::Project < Spinach::FeatureSteps
step 'change project default branch' do
select 'fix', from: 'project_default_branch'
- click_button 'Save changes'
+ page.within '.general-settings' do
+ click_button 'Save changes'
+ end
end
step 'I should see project default branch changed' do
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index f6edf93b311..00f7cded2ae 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -103,7 +103,7 @@ module SharedProject
step 'I should see project settings' do
expect(current_path).to eq edit_project_path(@project)
expect(page).to have_content("Project name")
- expect(page).to have_content("Sharing & Permissions")
+ expect(page).to have_content("Sharing and permissions")
end
def current_project