summaryrefslogtreecommitdiff
path: root/spec/features/explore
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-06-21 09:43:58 -0700
committerStan Hu <stanhu@gmail.com>2017-06-21 09:43:58 -0700
commit0f943c941bf0c7abc0358598f4a323b031bcca80 (patch)
tree7dd8ea3484252d469368498846c2c2b7f7500af4 /spec/features/explore
parent74fbc694de9a9cfe8a048c3c8d937f8e7068ce21 (diff)
parent043f8c260f49bb14f1c40ec563179c12c3df7828 (diff)
downloadgitlab-ce-0f943c941bf0c7abc0358598f4a323b031bcca80.tar.gz
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/explore')
-rw-r--r--spec/features/explore/groups_list_spec.rb2
-rw-r--r--spec/features/explore/new_menu_spec.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb
index d4284ed099b..6be5dee0c3c 100644
--- a/spec/features/explore/groups_list_spec.rb
+++ b/spec/features/explore/groups_list_spec.rb
@@ -10,7 +10,7 @@ describe 'Explore Groups page', :js, :feature do
before do
group.add_owner(user)
- login_as(user)
+ gitlab_sign_in(user)
visit explore_groups_path
end
diff --git a/spec/features/explore/new_menu_spec.rb b/spec/features/explore/new_menu_spec.rb
index b1dbf48b221..35c596d8578 100644
--- a/spec/features/explore/new_menu_spec.rb
+++ b/spec/features/explore/new_menu_spec.rb
@@ -16,7 +16,7 @@ feature 'Top Plus Menu', feature: true, js: true do
context 'used by full user' do
before do
- login_as(user)
+ gitlab_sign_in(user)
end
scenario 'click on New project shows new project page' do
@@ -103,7 +103,7 @@ feature 'Top Plus Menu', feature: true, js: true do
context 'used by guest user' do
before do
- login_as(guest_user)
+ gitlab_sign_in(guest_user)
end
scenario 'click on New issue shows new issue page' do