From d262daa4f0f425ddda189ae9e2eb21bbf287f21a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 25 Nov 2015 11:44:39 +0100 Subject: Split group feature tests Signed-off-by: Dmitriy Zaporozhets --- features/steps/shared/user.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'features/steps/shared/user.rb') diff --git a/features/steps/shared/user.rb b/features/steps/shared/user.rb index fc1e8d6e889..250cc5b94f3 100644 --- a/features/steps/shared/user.rb +++ b/features/steps/shared/user.rb @@ -9,6 +9,10 @@ module SharedUser user_exists("Mary Jane", { username: "mary_jane" }) end + step 'gitlab user "Mike"' do + create(:user, name: "Mike") + end + protected def user_exists(name, options = {}) -- cgit v1.2.1 From 94dc9ef9e1a85b8a4506358479a549dc3a1306b6 Mon Sep 17 00:00:00 2001 From: Eirik Lygre Date: Wed, 9 Dec 2015 02:02:53 +0100 Subject: Move ssh-key steps into SharedUser. Change references in "Explore Projects" feature. Apply ssh-key requirement to "Project Create" feature. --- features/steps/shared/user.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'features/steps/shared/user.rb') 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 -- cgit v1.2.1 From 7a2a860adcda179578098afb9b84894c1670f2c7 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 9 Dec 2015 12:09:00 -0500 Subject: Simplify shared User SSH key steps --- features/steps/shared/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'features/steps/shared/user.rb') diff --git a/features/steps/shared/user.rb b/features/steps/shared/user.rb index 33c146f6dbc..f0721094ee3 100644 --- a/features/steps/shared/user.rb +++ b/features/steps/shared/user.rb @@ -20,10 +20,10 @@ module SharedUser 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") + create(:personal_key, user: @user) end step 'I have no ssh keys' do - Key.delete_all + @user.keys.delete_all end end -- cgit v1.2.1