diff options
author | Eirik Lygre <eirik.lygre@gmail.com> | 2015-12-09 04:02:53 +0300 |
---|---|---|
committer | Eirik Lygre <eirik.lygre@gmail.com> | 2015-12-09 04:02:53 +0300 |
commit | 94dc9ef9e1a85b8a4506358479a549dc3a1306b6 (patch) | |
tree | 6e7902ffea43875a924166f465ff6cb78f8f208e /features | |
parent | 430aa23a5b82b34912dc86c323087fabd2849b7c (diff) |
Move ssh-key steps into SharedUser. Change references in "Explore Projects" feature. Apply ssh-key requirement to "Project Create" feature.
Diffstat (limited to 'features')
-rw-r--r-- | features/explore/projects.feature | 4 | ||||
-rw-r--r-- | features/project/create.feature | 2 | ||||
-rw-r--r-- | features/steps/explore/projects.rb | 9 | ||||
-rw-r--r-- | features/steps/project/create.rb | 1 | ||||
-rw-r--r-- | features/steps/shared/user.rb | 8 |
5 files changed, 14 insertions, 10 deletions
diff --git a/features/explore/projects.feature b/features/explore/projects.feature index 63b0ac65c4b..629859e960d 100644 --- a/features/explore/projects.feature +++ b/features/explore/projects.feature @@ -41,7 +41,7 @@ Feature: Explore Projects Scenario: I visit an empty public project page as user with an ssh-key Given I sign in as a user - And I have ssh key "ssh-rsa Work" + And I have an ssh key And public empty project "Empty Public Project" When I visit empty project page Then I should see empty public project details @@ -75,7 +75,7 @@ Feature: Explore Projects Scenario: I visit public project page as user with an ssh-key Given I sign in as a user - And I have ssh key "ssh-rsa Work" + And I have an ssh key When I visit project "Community" page Then I should see project "Community" home page And I should see an ssh link to the repository diff --git a/features/project/create.feature b/features/project/create.feature index e9dc4fe6b3c..a86079143e5 100644 --- a/features/project/create.feature +++ b/features/project/create.feature @@ -7,6 +7,7 @@ Feature: Project Create Scenario: User create a project Given I sign in as a user When I visit new project page + And I have an ssh key And fill project form with valid data Then I should see project page And I should see empty project instuctions @@ -14,6 +15,7 @@ Feature: Project Create @javascript Scenario: Empty project instructions Given I sign in as a user + And I have an ssh key When I visit new project page And fill project form with valid data Then I see empty project instuctions diff --git a/features/steps/explore/projects.rb b/features/steps/explore/projects.rb index 82cb9e24062..f819dec2192 100644 --- a/features/steps/explore/projects.rb +++ b/features/steps/explore/projects.rb @@ -2,6 +2,7 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps include SharedAuthentication include SharedPaths include SharedProject + include SharedUser step 'I should see project "Empty Public Project"' do expect(page).to have_content "Empty Public Project" @@ -144,12 +145,4 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps def public_merge_request @public_merge_request ||= MergeRequest.find_by!(title: 'Bug fix for public project') end - - step 'I have ssh key "ssh-rsa Work"' do - create(:key, user: @user, title: "ssh-rsa Work", key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+L3TbFegm3k8QjejSwemk4HhlRh+DuN679Pc5ckqE/MPhVtE/+kZQDYCTB284GiT2aIoGzmZ8ee9TkaoejAsBwlA+Wz2Q3vhz65X6sMgalRwpdJx8kSEUYV8ZPV3MZvPo8KdNg993o4jL6G36GDW4BPIyO6FPZhfsawdf6liVD0Xo5kibIK7B9VoE178cdLQtLpS2YolRwf5yy6XR6hbbBGQR+6xrGOdP16eGZDb1CE2bMvvJijjloFqPscGktWOqW+nfh5txwFfBzlfARDTBsS8WZtg3Yoj1kn33kPsWRlgHfNutFRAIynDuDdQzQq8tTtVwm+Yi75RfcPHW8y3P Work") - end - - step 'I have no ssh keys' do - Key.delete_all - end end diff --git a/features/steps/project/create.rb b/features/steps/project/create.rb index 0d39e1997b5..f90218f3791 100644 --- a/features/steps/project/create.rb +++ b/features/steps/project/create.rb @@ -1,6 +1,7 @@ class Spinach::Features::ProjectCreate < Spinach::FeatureSteps include SharedAuthentication include SharedPaths + include SharedUser step 'fill project form with valid data' do fill_in 'project_path', with: 'Empty' diff --git a/features/steps/shared/user.rb b/features/steps/shared/user.rb index 250cc5b94f3..33c146f6dbc 100644 --- a/features/steps/shared/user.rb +++ b/features/steps/shared/user.rb @@ -18,4 +18,12 @@ module SharedUser def user_exists(name, options = {}) User.find_by(name: name) || create(:user, { name: name, admin: false }.merge(options)) end + + step 'I have an ssh key' do + create(:key, user: @user, title: "An ssh-key", key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+L3TbFegm3k8QjejSwemk4HhlRh+DuN679Pc5ckqE/MPhVtE/+kZQDYCTB284GiT2aIoGzmZ8ee9TkaoejAsBwlA+Wz2Q3vhz65X6sMgalRwpdJx8kSEUYV8ZPV3MZvPo8KdNg993o4jL6G36GDW4BPIyO6FPZhfsawdf6liVD0Xo5kibIK7B9VoE178cdLQtLpS2YolRwf5yy6XR6hbbBGQR+6xrGOdP16eGZDb1CE2bMvvJijjloFqPscGktWOqW+nfh5txwFfBzlfARDTBsS8WZtg3Yoj1kn33kPsWRlgHfNutFRAIynDuDdQzQq8tTtVwm+Yi75RfcPHW8y3P Work") + end + + step 'I have no ssh keys' do + Key.delete_all + end end |