Commit e939bf7b authored by Robert Speicher's avatar Robert Speicher

Change gitlab_sign_in to sign_in where possible

parent 5a983ac4
...@@ -4,7 +4,7 @@ feature 'Abuse reports', feature: true do ...@@ -4,7 +4,7 @@ feature 'Abuse reports', feature: true do
let(:another_user) { create(:user) } let(:another_user) { create(:user) }
before do before do
gitlab_sign_in :user sign_in(create(:user))
end end
scenario 'Report abuse' do scenario 'Report abuse' do
......
...@@ -5,7 +5,7 @@ describe "Admin::AbuseReports", feature: true, js: true do ...@@ -5,7 +5,7 @@ describe "Admin::AbuseReports", feature: true, js: true do
context 'as an admin' do context 'as an admin' do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
describe 'if a user has been reported for abuse' do describe 'if a user has been reported for abuse' do
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
RSpec.describe 'admin active tab' do RSpec.describe 'admin active tab' do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
shared_examples 'page has active tab' do |title| shared_examples 'page has active tab' do |title|
......
...@@ -4,7 +4,7 @@ feature 'Admin Appearance', feature: true do ...@@ -4,7 +4,7 @@ feature 'Admin Appearance', feature: true do
let!(:appearance) { create(:appearance) } let!(:appearance) { create(:appearance) }
scenario 'Create new appearance' do scenario 'Create new appearance' do
gitlab_sign_in :admin sign_in(create(:admin))
visit admin_appearances_path visit admin_appearances_path
fill_in 'appearance_title', with: 'MyCompany' fill_in 'appearance_title', with: 'MyCompany'
...@@ -20,7 +20,7 @@ feature 'Admin Appearance', feature: true do ...@@ -20,7 +20,7 @@ feature 'Admin Appearance', feature: true do
end end
scenario 'Preview appearance' do scenario 'Preview appearance' do
gitlab_sign_in :admin sign_in(create(:admin))
visit admin_appearances_path visit admin_appearances_path
click_link "Preview" click_link "Preview"
...@@ -34,7 +34,7 @@ feature 'Admin Appearance', feature: true do ...@@ -34,7 +34,7 @@ feature 'Admin Appearance', feature: true do
end end
scenario 'Appearance logo' do scenario 'Appearance logo' do
gitlab_sign_in :admin sign_in(create(:admin))
visit admin_appearances_path visit admin_appearances_path
attach_file(:appearance_logo, logo_fixture) attach_file(:appearance_logo, logo_fixture)
...@@ -46,7 +46,7 @@ feature 'Admin Appearance', feature: true do ...@@ -46,7 +46,7 @@ feature 'Admin Appearance', feature: true do
end end
scenario 'Header logos' do scenario 'Header logos' do
gitlab_sign_in :admin sign_in(create(:admin))
visit admin_appearances_path visit admin_appearances_path
attach_file(:appearance_header_logo, logo_fixture) attach_file(:appearance_header_logo, logo_fixture)
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Admin Broadcast Messages', feature: true do feature 'Admin Broadcast Messages', feature: true do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
create(:broadcast_message, :expired, message: 'Migration to new server') create(:broadcast_message, :expired, message: 'Migration to new server')
visit admin_broadcast_messages_path visit admin_broadcast_messages_path
end end
......
...@@ -4,7 +4,7 @@ describe 'Admin browse spam logs' do ...@@ -4,7 +4,7 @@ describe 'Admin browse spam logs' do
let!(:spam_log) { create(:spam_log, description: 'abcde ' * 20) } let!(:spam_log) { create(:spam_log, description: 'abcde ' * 20) }
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
scenario 'Browse spam logs' do scenario 'Browse spam logs' do
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'Admin browses logs' do describe 'Admin browses logs' do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
it 'shows available log files' do it 'shows available log files' do
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'Admin Builds' do describe 'Admin Builds' do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
describe 'GET /admin/builds' do describe 'GET /admin/builds' do
......
...@@ -2,7 +2,7 @@ require 'rails_helper' ...@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Admin cohorts page', feature: true do feature 'Admin cohorts page', feature: true do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
scenario 'See users count per month' do scenario 'See users count per month' do
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'Admin Conversational Development Index' do describe 'Admin Conversational Development Index' do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
context 'when usage ping is disabled' do context 'when usage ping is disabled' do
......
...@@ -5,7 +5,7 @@ RSpec.describe 'admin deploy keys', type: :feature do ...@@ -5,7 +5,7 @@ RSpec.describe 'admin deploy keys', type: :feature do
let!(:another_deploy_key) { create(:another_deploy_key, public: true) } let!(:another_deploy_key) { create(:another_deploy_key, public: true) }
before do before do
gitlab_sign_in(:admin) sign_in(create(:admin))
end end
it 'show all public deploy keys' do it 'show all public deploy keys' do
......
...@@ -8,7 +8,7 @@ feature 'Admin disables Git access protocol', feature: true do ...@@ -8,7 +8,7 @@ feature 'Admin disables Git access protocol', feature: true do
background do background do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
gitlab_sign_in(admin) sign_in(admin)
end end
context 'with HTTP disabled' do context 'with HTTP disabled' do
......
...@@ -2,7 +2,7 @@ require 'rails_helper' ...@@ -2,7 +2,7 @@ require 'rails_helper'
feature 'Admin disables 2FA for a user', feature: true do feature 'Admin disables 2FA for a user', feature: true do
scenario 'successfully', js: true do scenario 'successfully', js: true do
gitlab_sign_in(:admin) sign_in(create(:admin))
user = create(:user, :two_factor) user = create(:user, :two_factor)
edit_user(user) edit_user(user)
...@@ -17,7 +17,7 @@ feature 'Admin disables 2FA for a user', feature: true do ...@@ -17,7 +17,7 @@ feature 'Admin disables 2FA for a user', feature: true do
end end
scenario 'for a user without 2FA enabled' do scenario 'for a user without 2FA enabled' do
gitlab_sign_in(:admin) sign_in(create(:admin))
user = create(:user) user = create(:user)
edit_user(user) edit_user(user)
......
...@@ -6,9 +6,10 @@ feature 'Admin Groups', feature: true do ...@@ -6,9 +6,10 @@ feature 'Admin Groups', feature: true do
let(:internal) { Gitlab::VisibilityLevel::INTERNAL } let(:internal) { Gitlab::VisibilityLevel::INTERNAL }
let(:user) { create :user } let(:user) { create :user }
let!(:group) { create :group } let!(:group) { create :group }
let!(:current_user) { gitlab_sign_in :admin } let!(:current_user) { create(:admin) }
before do before do
sign_in(current_user)
stub_application_setting(default_group_visibility: internal) stub_application_setting(default_group_visibility: internal)
end end
......
...@@ -5,7 +5,7 @@ feature "Admin Health Check", feature: true do ...@@ -5,7 +5,7 @@ feature "Admin Health Check", feature: true do
before do before do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
gitlab_sign_in :admin sign_in(create(:admin))
end end
describe '#show' do describe '#show' do
......
...@@ -6,7 +6,7 @@ feature 'Admin::HookLogs', feature: true do ...@@ -6,7 +6,7 @@ feature 'Admin::HookLogs', feature: true do
let(:hook_log) { create(:web_hook_log, web_hook: system_hook, internal_error_message: 'some error') } let(:hook_log) { create(:web_hook_log, web_hook: system_hook, internal_error_message: 'some error') }
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
scenario 'show list of hook logs' do scenario 'show list of hook logs' do
......
...@@ -3,7 +3,7 @@ require 'spec_helper' ...@@ -3,7 +3,7 @@ require 'spec_helper'
describe 'Admin::Hooks', feature: true do describe 'Admin::Hooks', feature: true do
before do before do
@project = create(:project) @project = create(:project)
gitlab_sign_in :admin sign_in(create(:admin))
@system_hook = create(:system_hook) @system_hook = create(:system_hook)
end end
......
...@@ -5,7 +5,7 @@ RSpec.describe 'admin issues labels' do ...@@ -5,7 +5,7 @@ RSpec.describe 'admin issues labels' do
let!(:feature_label) { Label.create(title: 'feature', template: true) } let!(:feature_label) { Label.create(title: 'feature', template: true) }
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
describe 'list' do describe 'list' do
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
RSpec.describe 'admin manage applications', feature: true do RSpec.describe 'admin manage applications', feature: true do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
it do it do
......
...@@ -5,8 +5,10 @@ describe "Admin::Projects", feature: true do ...@@ -5,8 +5,10 @@ describe "Admin::Projects", feature: true do
let(:user) { create :user } let(:user) { create :user }
let!(:project) { create(:project) } let!(:project) { create(:project) }
let!(:current_user) do let!(:current_user) { create(:admin) }
gitlab_sign_in :admin
before do
sign_in(current_user)
end end
describe "GET /admin/projects" do describe "GET /admin/projects" do
......
...@@ -3,7 +3,7 @@ require 'spec_helper' ...@@ -3,7 +3,7 @@ require 'spec_helper'
describe 'Admin::RequestsProfilesController', feature: true do describe 'Admin::RequestsProfilesController', feature: true do
before do before do
FileUtils.mkdir_p(Gitlab::RequestProfiler::PROFILES_DIR) FileUtils.mkdir_p(Gitlab::RequestProfiler::PROFILES_DIR)
gitlab_sign_in(:admin) sign_in(create(:admin))
end end
after do after do
......
...@@ -5,7 +5,7 @@ describe "Admin Runners" do ...@@ -5,7 +5,7 @@ describe "Admin Runners" do
before do before do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
gitlab_sign_in :admin sign_in(create(:admin))
end end
describe "Runners page" do describe "Runners page" do
......
...@@ -5,7 +5,7 @@ feature 'Admin updates settings', feature: true do ...@@ -5,7 +5,7 @@ feature 'Admin updates settings', feature: true do
before do before do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
gitlab_sign_in :admin sign_in(create(:admin))
visit admin_application_settings_path visit admin_application_settings_path
end end
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'Admin System Info' do describe 'Admin System Info' do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
describe 'GET /admin/system_info' do describe 'GET /admin/system_info' do
......
...@@ -13,7 +13,7 @@ describe 'Admin > Users > Impersonation Tokens', feature: true, js: true do ...@@ -13,7 +13,7 @@ describe 'Admin > Users > Impersonation Tokens', feature: true, js: true do
end end
before do before do
gitlab_sign_in(admin) sign_in(admin)
end end
describe "token creation" do describe "token creation" do
......
...@@ -5,7 +5,11 @@ describe "Admin::Users", feature: true do ...@@ -5,7 +5,11 @@ describe "Admin::Users", feature: true do
create(:omniauth_user, provider: 'twitter', extern_uid: '123456') create(:omniauth_user, provider: 'twitter', extern_uid: '123456')
end end
let!(:current_user) { gitlab_sign_in :admin } let!(:current_user) { create(:admin) }
before do
sign_in(current_user)
end
describe "GET /admin/users" do describe "GET /admin/users" do
before do before do
......
...@@ -5,7 +5,7 @@ feature 'Admin uses repository checks', feature: true do ...@@ -5,7 +5,7 @@ feature 'Admin uses repository checks', feature: true do
before do before do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
gitlab_sign_in :admin sign_in(create(:admin))
end end
scenario 'to trigger a single check' do scenario 'to trigger a single check' do
......
...@@ -15,7 +15,7 @@ describe 'Issues Feed', feature: true do ...@@ -15,7 +15,7 @@ describe 'Issues Feed', feature: true do
context 'when authenticated' do context 'when authenticated' do
it 'renders atom feed' do it 'renders atom feed' do
gitlab_sign_in user sign_in user
visit namespace_project_issues_path(project.namespace, project, :atom) visit namespace_project_issues_path(project.namespace, project, :atom)
expect(response_headers['Content-Type']) expect(response_headers['Content-Type'])
......
...@@ -7,7 +7,7 @@ describe 'Auto deploy' do ...@@ -7,7 +7,7 @@ describe 'Auto deploy' do
before do before do
create :kubernetes_service, project: project create :kubernetes_service, project: project
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
end end
context 'when no deployment service is active' do context 'when no deployment service is active' do
......
...@@ -14,7 +14,7 @@ describe 'Issue Boards add issue modal', :feature, :js do ...@@ -14,7 +14,7 @@ describe 'Issue Boards add issue modal', :feature, :js do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_board_path(project.namespace, project, board) visit namespace_project_board_path(project.namespace, project, board)
wait_for_requests wait_for_requests
......
...@@ -12,7 +12,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -12,7 +12,7 @@ describe 'Issue Boards', feature: true, js: true do
project.team << [user, :master] project.team << [user, :master]
project.team << [user2, :master] project.team << [user2, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'no lists' do context 'no lists' do
...@@ -519,7 +519,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -519,7 +519,7 @@ describe 'Issue Boards', feature: true, js: true do
context 'signed out user' do context 'signed out user' do
before do before do
gitlab_sign_out sign_out(:user)
visit namespace_project_board_path(project.namespace, project, board) visit namespace_project_board_path(project.namespace, project, board)
wait_for_requests wait_for_requests
end end
...@@ -542,8 +542,8 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -542,8 +542,8 @@ describe 'Issue Boards', feature: true, js: true do
before do before do
project.team << [user_guest, :guest] project.team << [user_guest, :guest]
gitlab_sign_out sign_out(:user)
gitlab_sign_in(user_guest) sign_in(user_guest)
visit namespace_project_board_path(project.namespace, project, board) visit namespace_project_board_path(project.namespace, project, board)
wait_for_requests wait_for_requests
end end
......
...@@ -15,7 +15,7 @@ describe 'Issue Boards', :feature, :js do ...@@ -15,7 +15,7 @@ describe 'Issue Boards', :feature, :js do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'un-ordered issues' do context 'un-ordered issues' do
......
...@@ -6,7 +6,7 @@ describe 'Issue Boards shortcut', feature: true, js: true do ...@@ -6,7 +6,7 @@ describe 'Issue Boards shortcut', feature: true, js: true do
before do before do
create(:board, project: project) create(:board, project: project)
gitlab_sign_in :admin sign_in(create(:admin))
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -12,7 +12,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do ...@@ -12,7 +12,7 @@ describe 'Issue Boards add issue modal filtering', :feature, :js do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
it 'shows empty state when no results found' do it 'shows empty state when no results found' do
......
...@@ -10,7 +10,7 @@ describe 'Issue Boards new issue', feature: true, js: true do ...@@ -10,7 +10,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_board_path(project.namespace, project, board) visit namespace_project_board_path(project.namespace, project, board)
wait_for_requests wait_for_requests
......
...@@ -20,7 +20,7 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -20,7 +20,7 @@ describe 'Issue Boards', feature: true, js: true do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_board_path(project.namespace, project, board) visit namespace_project_board_path(project.namespace, project, board)
wait_for_requests wait_for_requests
......
...@@ -13,7 +13,7 @@ describe 'Sub-group project issue boards', :feature, :js do ...@@ -13,7 +13,7 @@ describe 'Sub-group project issue boards', :feature, :js do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_board_path(project.namespace, project, board) visit namespace_project_board_path(project.namespace, project, board)
wait_for_requests wait_for_requests
......
...@@ -68,7 +68,7 @@ feature 'Contributions Calendar', :feature, :js do ...@@ -68,7 +68,7 @@ feature 'Contributions Calendar', :feature, :js do
end end
before do before do
gitlab_sign_in user sign_in user
end end
describe 'calendar day selection' do describe 'calendar day selection' do
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
describe 'CI Lint', js: true do describe 'CI Lint', js: true do
before do before do
gitlab_sign_in :user sign_in(create(:user))
end end
describe 'YAML parsing' do describe 'YAML parsing' do
......
...@@ -9,7 +9,7 @@ describe "Container Registry" do ...@@ -9,7 +9,7 @@ describe "Container Registry" do
end end
before do before do
gitlab_sign_in(user) sign_in(user)
project.add_developer(user) project.add_developer(user)
stub_container_registry_config(enabled: true) stub_container_registry_config(enabled: true)
stub_container_registry_tags(repository: :any, tags: []) stub_container_registry_tags(repository: :any, tags: [])
......
...@@ -6,7 +6,7 @@ describe 'Copy as GFM', feature: true, js: true do ...@@ -6,7 +6,7 @@ describe 'Copy as GFM', feature: true, js: true do
include ActionView::Helpers::JavaScriptHelper include ActionView::Helpers::JavaScriptHelper
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
describe 'Copying rendered GFM' do describe 'Copying rendered GFM' do
......
...@@ -14,7 +14,7 @@ feature 'Cycle Analytics', feature: true, js: true do ...@@ -14,7 +14,7 @@ feature 'Cycle Analytics', feature: true, js: true do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_cycle_analytics_path(project.namespace, project) visit namespace_project_cycle_analytics_path(project.namespace, project)
wait_for_requests wait_for_requests
...@@ -38,7 +38,7 @@ feature 'Cycle Analytics', feature: true, js: true do ...@@ -38,7 +38,7 @@ feature 'Cycle Analytics', feature: true, js: true do
create_cycle create_cycle
deploy_master deploy_master
gitlab_sign_in(user) sign_in(user)
visit namespace_project_cycle_analytics_path(project.namespace, project) visit namespace_project_cycle_analytics_path(project.namespace, project)
end end
...@@ -70,7 +70,7 @@ feature 'Cycle Analytics', feature: true, js: true do ...@@ -70,7 +70,7 @@ feature 'Cycle Analytics', feature: true, js: true do
user.update_attribute(:preferred_language, 'es') user.update_attribute(:preferred_language, 'es')
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_cycle_analytics_path(project.namespace, project) visit namespace_project_cycle_analytics_path(project.namespace, project)
wait_for_requests wait_for_requests
end end
...@@ -93,7 +93,7 @@ feature 'Cycle Analytics', feature: true, js: true do ...@@ -93,7 +93,7 @@ feature 'Cycle Analytics', feature: true, js: true do
create_cycle create_cycle
deploy_master deploy_master
gitlab_sign_in(guest) sign_in(guest)
visit namespace_project_cycle_analytics_path(project.namespace, project) visit namespace_project_cycle_analytics_path(project.namespace, project)
wait_for_requests wait_for_requests
end end
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
RSpec.describe 'Dashboard Active Tab', js: true, feature: true do RSpec.describe 'Dashboard Active Tab', js: true, feature: true do
before do before do
gitlab_sign_in :user sign_in(create(:user))
end end
shared_examples 'page has active tab' do |title| shared_examples 'page has active tab' do |title|
......
require 'spec_helper' require 'spec_helper'
RSpec.describe 'Dashboard Activity', feature: true do RSpec.describe 'Dashboard Activity', feature: true do
let(:user) { create(:user) }
before do before do
gitlab_sign_in(create :user) sign_in(user)
visit activity_dashboard_path visit activity_dashboard_path
end end
......
...@@ -9,7 +9,7 @@ RSpec.describe 'Dashboard Archived Project', feature: true do ...@@ -9,7 +9,7 @@ RSpec.describe 'Dashboard Archived Project', feature: true do
project.team << [user, :master] project.team << [user, :master]
archived_project.team << [user, :master] archived_project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit dashboard_projects_path visit dashboard_projects_path
end end
......
...@@ -13,7 +13,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do ...@@ -13,7 +13,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do
Event.create( project: project, author_id: user.id, action: Event::JOINED, Event.create( project: project, author_id: user.id, action: Event::JOINED,
updated_at: created_date, created_at: created_date) updated_at: created_date, created_at: created_date)
gitlab_sign_in user sign_in user
visit user_path(user) visit user_path(user)
wait_for_requests() wait_for_requests()
...@@ -30,7 +30,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do ...@@ -30,7 +30,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do
project.team << [user, :master] project.team << [user, :master]
create(:snippet, author: user, updated_at: created_date, created_at: created_date) create(:snippet, author: user, updated_at: created_date, created_at: created_date)
gitlab_sign_in user sign_in user
visit user_snippets_path(user) visit user_snippets_path(user)
wait_for_requests() wait_for_requests()
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
RSpec.describe 'Dashboard Group', feature: true do RSpec.describe 'Dashboard Group', feature: true do
before do before do
gitlab_sign_in(:user) sign_in(create(:user))
end end
it 'creates new group', js: true do it 'creates new group', js: true do
......
...@@ -10,7 +10,7 @@ describe 'Dashboard Groups page', js: true, feature: true do ...@@ -10,7 +10,7 @@ describe 'Dashboard Groups page', js: true, feature: true do
group.add_owner(user) group.add_owner(user)
nested_group.add_owner(user) nested_group.add_owner(user)
gitlab_sign_in(user) sign_in(user)
visit dashboard_groups_path visit dashboard_groups_path
expect(page).to have_content(group.full_name) expect(page).to have_content(group.full_name)
...@@ -23,7 +23,7 @@ describe 'Dashboard Groups page', js: true, feature: true do ...@@ -23,7 +23,7 @@ describe 'Dashboard Groups page', js: true, feature: true do
group.add_owner(user) group.add_owner(user)
nested_group.add_owner(user) nested_group.add_owner(user)
gitlab_sign_in(user) sign_in(user)
visit dashboard_groups_path visit dashboard_groups_path
end end
...@@ -58,7 +58,7 @@ describe 'Dashboard Groups page', js: true, feature: true do ...@@ -58,7 +58,7 @@ describe 'Dashboard Groups page', js: true, feature: true do
group.add_owner(user) group.add_owner(user)
subgroup.add_owner(user) subgroup.add_owner(user)
gitlab_sign_in(user) sign_in(user)
visit dashboard_groups_path visit dashboard_groups_path
end end
...@@ -98,7 +98,7 @@ describe 'Dashboard Groups page', js: true, feature: true do ...@@ -98,7 +98,7 @@ describe 'Dashboard Groups page', js: true, feature: true do
allow(Kaminari.config).to receive(:default_per_page).and_return(1) allow(Kaminari.config).to receive(:default_per_page).and_return(1)
gitlab_sign_in(user) sign_in(user)
visit dashboard_groups_path visit dashboard_groups_path
end end
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
RSpec.describe 'Dashboard Help', feature: true do RSpec.describe 'Dashboard Help', feature: true do
before do before do
gitlab_sign_in(:user) sign_in(create(:user))
end end
it 'renders correctly markdown' do it 'renders correctly markdown' do
......
...@@ -9,7 +9,7 @@ describe 'Navigation bar counter', feature: true, caching: true do ...@@ -9,7 +9,7 @@ describe 'Navigation bar counter', feature: true, caching: true do
before do before do
issue.assignees = [user] issue.assignees = [user]
merge_request.update(assignee: user) merge_request.update(assignee: user)
gitlab_sign_in(user) sign_in(user)
end end
it 'reflects dashboard issues count' do it 'reflects dashboard issues count' do
......
...@@ -2,6 +2,7 @@ require 'spec_helper' ...@@ -2,6 +2,7 @@ require 'spec_helper'
RSpec.describe 'Dashboard Issues', feature: true do RSpec.describe 'Dashboard Issues', feature: true do
let(:current_user) { create :user } let(:current_user) { create :user }
let(:user) { current_user } # Shared examples depend on this being available
let!(:public_project) { create(:empty_project, :public) } let!(:public_project) { create(:empty_project, :public) }
let(:project) { create(:empty_project) } let(:project) { create(:empty_project) }
let(:project_with_issues_disabled) { create(:empty_project, :issues_disabled) } let(:project_with_issues_disabled) { create(:empty_project, :issues_disabled) }
...@@ -12,7 +13,7 @@ RSpec.describe 'Dashboard Issues', feature: true do ...@@ -12,7 +13,7 @@ RSpec.describe 'Dashboard Issues', feature: true do
before do before do
[project, project_with_issues_disabled].each { |project| project.team << [current_user, :master] } [project, project_with_issues_disabled].each { |project| project.team << [current_user, :master] }
gitlab_sign_in(current_user) sign_in(current_user)
visit issues_dashboard_path(assignee_id: current_user.id) visit issues_dashboard_path(assignee_id: current_user.id)
end end
......
...@@ -11,7 +11,7 @@ describe 'Dashboard > label filter', feature: true, js: true do ...@@ -11,7 +11,7 @@ describe 'Dashboard > label filter', feature: true, js: true do
project.labels << label project.labels << label
project2.labels << label2 project2.labels << label2
gitlab_sign_in(user) sign_in(user)
visit issues_dashboard_path visit issues_dashboard_path
end end
......
...@@ -11,7 +11,7 @@ feature 'Dashboard > milestone filter', :feature, :js do ...@@ -11,7 +11,7 @@ feature 'Dashboard > milestone filter', :feature, :js do
let!(:issue2) { create :issue, author: user, project: project, milestone: milestone2 } let!(:issue2) { create :issue, author: user, project: project, milestone: milestone2 }
before do before do
gitlab_sign_in(user) sign_in(user)
visit issues_dashboard_path(author_id: user.id) visit issues_dashboard_path(author_id: user.id)
end end
......
...@@ -15,7 +15,7 @@ describe 'Dashboard milestone tabs', :js, :feature do ...@@ -15,7 +15,7 @@ describe 'Dashboard milestone tabs', :js, :feature do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit dashboard_milestone_path(milestone.safe_title, title: milestone.title) visit dashboard_milestone_path(milestone.safe_title, title: milestone.title)
end end
......
...@@ -7,7 +7,13 @@ RSpec.describe 'Dashboard Projects', feature: true do ...@@ -7,7 +7,13 @@ RSpec.describe 'Dashboard Projects', feature: true do
before do before do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
end
it_behaves_like "an autodiscoverable RSS feed with current_user's RSS token" do
before do
visit dashboard_projects_path
end
end end
it 'shows the project the user in a member of in the list' do it 'shows the project the user in a member of in the list' do
...@@ -63,6 +69,4 @@ RSpec.describe 'Dashboard Projects', feature: true do ...@@ -63,6 +69,4 @@ RSpec.describe 'Dashboard Projects', feature: true do
expect(page).to have_xpath("//a[@href='#{pipelines_namespace_project_commit_path(project.namespace, project, project.commit)}']") expect(page).to have_xpath("//a[@href='#{pipelines_namespace_project_commit_path(project.namespace, project, project.commit)}']")
end end
end end
it_behaves_like "an autodiscoverable RSS feed with current_user's RSS token"
end end
...@@ -3,7 +3,7 @@ require 'spec_helper' ...@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'Dashboard shortcuts', :feature, :js do feature 'Dashboard shortcuts', :feature, :js do
context 'logged in' do context 'logged in' do
before do before do
gitlab_sign_in :user sign_in(create(:user))
visit root_dashboard_path visit root_dashboard_path
end end
......
...@@ -6,7 +6,7 @@ describe 'Dashboard snippets', feature: true do ...@@ -6,7 +6,7 @@ describe 'Dashboard snippets', feature: true do
let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.owner, project: project) } let!(:snippets) { create_list(:project_snippet, 2, :public, author: project.owner, project: project) }
before do before do
allow(Snippet).to receive(:default_per_page).and_return(1) allow(Snippet).to receive(:default_per_page).and_return(1)
gitlab_sign_in(project.owner) sign_in(project.owner)
visit dashboard_snippets_path visit dashboard_snippets_path
end end
...@@ -25,7 +25,7 @@ describe 'Dashboard snippets', feature: true do ...@@ -25,7 +25,7 @@ describe 'Dashboard snippets', feature: true do
end end
before do before do
gitlab_sign_in(user) sign_in(user)
visit dashboard_snippets_path visit dashboard_snippets_path
end end
......
...@@ -83,7 +83,7 @@ feature 'Dashboard > User sorts todos' do ...@@ -83,7 +83,7 @@ feature 'Dashboard > User sorts todos' do
create(:todo, user: user, project: project, target: issue_2) create(:todo, user: user, project: project, target: issue_2)
create(:todo, user: user, project: project, target: merge_request_1) create(:todo, user: user, project: project, target: merge_request_1)
gitlab_sign_in(user) sign_in(user)
visit dashboard_todos_path visit dashboard_todos_path
end end
......
...@@ -9,7 +9,7 @@ describe 'Dashboard > User filters projects', :feature do ...@@ -9,7 +9,7 @@ describe 'Dashboard > User filters projects', :feature do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
describe 'filtering personal projects' do describe 'filtering personal projects' do
......
...@@ -8,7 +8,7 @@ describe "Dashboard Issues filtering", feature: true, js: true do ...@@ -8,7 +8,7 @@ describe "Dashboard Issues filtering", feature: true, js: true do
context 'filtering by milestone' do context 'filtering by milestone' do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
create(:issue, project: project, author: user, assignees: [user]) create(:issue, project: project, author: user, assignees: [user])
create(:issue, project: project, author: user, assignees: [user], milestone: milestone) create(:issue, project: project, author: user, assignees: [user], milestone: milestone)
......
...@@ -17,7 +17,7 @@ feature 'Dashboard > Milestones', feature: true do ...@@ -17,7 +17,7 @@ feature 'Dashboard > Milestones', feature: true do
let!(:milestone) { create(:milestone, project: project) } let!(:milestone) { create(:milestone, project: project) }
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit dashboard_milestones_path visit dashboard_milestones_path
end end
......
...@@ -9,7 +9,7 @@ describe 'Discussion Comments Merge Request', :feature, :js do ...@@ -9,7 +9,7 @@ describe 'Discussion Comments Merge Request', :feature, :js do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_commit_path(project.namespace, project, sample_commit.id) visit namespace_project_commit_path(project.namespace, project, sample_commit.id)
end end
......
...@@ -7,7 +7,7 @@ describe 'Discussion Comments Issue', :feature, :js do ...@@ -7,7 +7,7 @@ describe 'Discussion Comments Issue', :feature, :js do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
......
...@@ -7,7 +7,7 @@ describe 'Discussion Comments Merge Request', :feature, :js do ...@@ -7,7 +7,7 @@ describe 'Discussion Comments Merge Request', :feature, :js do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -7,7 +7,7 @@ describe 'Discussion Comments Issue', :feature, :js do ...@@ -7,7 +7,7 @@ describe 'Discussion Comments Issue', :feature, :js do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_snippet_path(project.namespace, project, snippet) visit namespace_project_snippet_path(project.namespace, project, snippet)
end end
......
...@@ -10,7 +10,7 @@ feature 'Expand and collapse diffs', js: true, feature: true do ...@@ -10,7 +10,7 @@ feature 'Expand and collapse diffs', js: true, feature: true do
allow(Gitlab::Git::Diff).to receive(:size_limit).and_return(100.kilobytes) allow(Gitlab::Git::Diff).to receive(:size_limit).and_return(100.kilobytes)
allow(Gitlab::Git::Diff).to receive(:collapse_limit).and_return(10.kilobytes) allow(Gitlab::Git::Diff).to receive(:collapse_limit).and_return(10.kilobytes)
gitlab_sign_in :admin sign_in(create(:admin))
# Ensure that undiffable.md is in .gitattributes # Ensure that undiffable.md is in .gitattributes
project.repository.copy_gitattributes(branch) project.repository.copy_gitattributes(branch)
......
...@@ -10,7 +10,7 @@ describe 'Explore Groups page', :js, :feature do ...@@ -10,7 +10,7 @@ describe 'Explore Groups page', :js, :feature do
before do before do
group.add_owner(user) group.add_owner(user)
gitlab_sign_in(user) sign_in(user)
visit explore_groups_path visit explore_groups_path
end end
......
...@@ -16,7 +16,7 @@ feature 'Top Plus Menu', feature: true, js: true do ...@@ -16,7 +16,7 @@ feature 'Top Plus Menu', feature: true, js: true do
context 'used by full user' do context 'used by full user' do
before do before do
gitlab_sign_in(user) sign_in(user)
end end
scenario 'click on New project shows new project page' do scenario 'click on New project shows new project page' do
...@@ -103,7 +103,7 @@ feature 'Top Plus Menu', feature: true, js: true do ...@@ -103,7 +103,7 @@ feature 'Top Plus Menu', feature: true, js: true do
context 'used by guest user' do context 'used by guest user' do
before do before do
gitlab_sign_in(guest_user) sign_in(guest_user)
end end
scenario 'click on New issue shows new issue page' do scenario 'click on New issue shows new issue page' do
......
...@@ -6,7 +6,7 @@ feature 'Global search', feature: true do ...@@ -6,7 +6,7 @@ feature 'Global search', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
describe 'I search through the issues and I see pagination' do describe 'I search through the issues and I see pagination' do
......
require 'spec_helper' require 'spec_helper'
feature 'Group activity page', feature: true do feature 'Group activity page', feature: true do
let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user }
let(:group) { create(:group) } let(:group) { create(:group) }
let(:path) { activity_group_path(group) } let(:path) { activity_group_path(group) }
context 'when signed in' do context 'when signed in' do
before do before do
user = create(:group_member, :developer, user: create(:user), group: group ).user sign_in(user)
gitlab_sign_in(user)
visit path visit path
end end
......
...@@ -5,7 +5,7 @@ feature 'Groups Merge Requests Empty States' do ...@@ -5,7 +5,7 @@ feature 'Groups Merge Requests Empty States' do
let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user } let(:user) { create(:group_member, :developer, user: create(:user), group: group ).user }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
context 'group has a project' do context 'group has a project' do
......
...@@ -9,7 +9,7 @@ feature 'Group name toggle', feature: true, js: true do ...@@ -9,7 +9,7 @@ feature 'Group name toggle', feature: true, js: true do
SMALL_SCREEN = 300 SMALL_SCREEN = 300
before do before do
gitlab_sign_in :user sign_in(create(:user))
end end
it 'is not present if enough horizontal space' do it 'is not present if enough horizontal space' do
......
...@@ -6,7 +6,7 @@ feature 'Edit group settings', feature: true do ...@@ -6,7 +6,7 @@ feature 'Edit group settings', feature: true do
background do background do
group.add_owner(user) group.add_owner(user)
gitlab_sign_in(user) sign_in(user)
end end
describe 'when the group path is changed' do describe 'when the group path is changed' do
......
...@@ -7,7 +7,7 @@ feature 'Edit group label', feature: true do ...@@ -7,7 +7,7 @@ feature 'Edit group label', feature: true do
background do background do
group.add_owner(user) group.add_owner(user)
gitlab_sign_in(user) sign_in(user)
visit edit_group_label_path(group, label) visit edit_group_label_path(group, label)
end end
......
...@@ -8,7 +8,7 @@ feature 'Groups > Members > Manage access requests', feature: true do ...@@ -8,7 +8,7 @@ feature 'Groups > Members > Manage access requests', feature: true do
background do background do
group.request_access(user) group.request_access(user)
group.add_owner(owner) group.add_owner(owner)
gitlab_sign_in(owner) sign_in(owner)
end end
scenario 'owner can see access requests' do scenario 'owner can see access requests' do
......
...@@ -8,7 +8,7 @@ feature 'Groups > Members > Manage members', feature: true do ...@@ -8,7 +8,7 @@ feature 'Groups > Members > Manage members', feature: true do
let(:group) { create(:group) } let(:group) { create(:group) }
background do background do
gitlab_sign_in(user1) sign_in(user1)
end end
scenario 'update user to owner level', :js do scenario 'update user to owner level', :js do
......
...@@ -8,7 +8,7 @@ feature 'Groups > Members > Request access', feature: true do ...@@ -8,7 +8,7 @@ feature 'Groups > Members > Request access', feature: true do
background do background do
group.add_owner(owner) group.add_owner(owner)
gitlab_sign_in(user) sign_in(user)
visit group_path(group) visit group_path(group)
end end
......
...@@ -9,7 +9,7 @@ feature 'Groups > Members > Sort members', feature: true do ...@@ -9,7 +9,7 @@ feature 'Groups > Members > Sort members', feature: true do
create(:group_member, :owner, user: owner, group: group, created_at: 5.days.ago) create(:group_member, :owner, user: owner, group: group, created_at: 5.days.ago)
create(:group_member, :developer, user: developer, group: group, created_at: 3.days.ago) create(:group_member, :developer, user: developer, group: group, created_at: 3.days.ago)
gitlab_sign_in(owner) sign_in(owner)
end end
scenario 'sorts alphabetically by default' do scenario 'sorts alphabetically by default' do
......
...@@ -8,7 +8,7 @@ feature 'Group milestones', :feature, :js do ...@@ -8,7 +8,7 @@ feature 'Group milestones', :feature, :js do
before do before do
Timecop.freeze Timecop.freeze
gitlab_sign_in(user) sign_in(user)
end end
after do after do
......
...@@ -5,9 +5,12 @@ feature 'Group show page', feature: true do ...@@ -5,9 +5,12 @@ feature 'Group show page', feature: true do
let(:path) { group_path(group) } let(:path) { group_path(group) }
context 'when signed in' do context 'when signed in' do
let(:user) do
create(:group_member, :developer, user: create(:user), group: group ).user
end
before do before do
user = create(:group_member, :developer, user: create(:user), group: group ).user sign_in(user)
gitlab_sign_in(user)
visit path visit path
end end
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Group', feature: true do feature 'Group', feature: true do
before do before do
gitlab_sign_in(:admin) sign_in(create(:admin))
end end
matcher :have_namespace_error_message do matcher :have_namespace_error_message do
...@@ -108,8 +108,8 @@ feature 'Group', feature: true do ...@@ -108,8 +108,8 @@ feature 'Group', feature: true do
before do before do
group.add_owner(user) group.add_owner(user)
gitlab_sign_out sign_out(:user)
gitlab_sign_in(user) sign_in(user)
visit subgroups_group_path(group) visit subgroups_group_path(group)
click_link 'New Subgroup' click_link 'New Subgroup'
...@@ -128,8 +128,8 @@ feature 'Group', feature: true do ...@@ -128,8 +128,8 @@ feature 'Group', feature: true do
it 'checks permissions to avoid exposing groups by parent_id' do it 'checks permissions to avoid exposing groups by parent_id' do
group = create(:group, :private, path: 'secret-group') group = create(:group, :private, path: 'secret-group')
gitlab_sign_out sign_out(:user)
gitlab_sign_in(:user) sign_in(create(:user))
visit new_group_path(parent_id: group.id) visit new_group_path(parent_id: group.id)
expect(page).not_to have_content('secret-group') expect(page).not_to have_content('secret-group')
......
...@@ -40,7 +40,7 @@ describe 'Help Pages', feature: true do ...@@ -40,7 +40,7 @@ describe 'Help Pages', feature: true do
allow_any_instance_of(ApplicationSetting).to receive(:version_check_enabled) { true } allow_any_instance_of(ApplicationSetting).to receive(:version_check_enabled) { true }
allow_any_instance_of(VersionCheck).to receive(:url) { '/version-check-url' } allow_any_instance_of(VersionCheck).to receive(:url) { '/version-check-url' }
gitlab_sign_in :user sign_in(create(:user))
visit help_path visit help_path
end end
...@@ -60,7 +60,7 @@ describe 'Help Pages', feature: true do ...@@ -60,7 +60,7 @@ describe 'Help Pages', feature: true do
allow_any_instance_of(ApplicationSetting).to receive(:help_page_text) { "My Custom Text" } allow_any_instance_of(ApplicationSetting).to receive(:help_page_text) { "My Custom Text" }
allow_any_instance_of(ApplicationSetting).to receive(:help_page_support_url) { "http://example.com/help" } allow_any_instance_of(ApplicationSetting).to receive(:help_page_support_url) { "http://example.com/help" }
gitlab_sign_in(:user) sign_in(create(:user))
visit help_path visit help_path
end end
......
...@@ -8,7 +8,7 @@ describe 'issuable list', feature: true do ...@@ -8,7 +8,7 @@ describe 'issuable list', feature: true do
before do before do
project.add_user(user, :developer) project.add_user(user, :developer)
gitlab_sign_in(user) sign_in(user)
issuable_types.each { |type| create_issuables(type) } issuable_types.each { |type| create_issuables(type) }
end end
......
...@@ -12,7 +12,7 @@ describe 'Awards Emoji', feature: true do ...@@ -12,7 +12,7 @@ describe 'Awards Emoji', feature: true do
context 'authorized user' do context 'authorized user' do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
describe 'visiting an issue with a legacy award emoji that is not valid anymore' do describe 'visiting an issue with a legacy award emoji that is not valid anymore' do
......
...@@ -7,7 +7,7 @@ feature 'Issue awards', js: true, feature: true do ...@@ -7,7 +7,7 @@ feature 'Issue awards', js: true, feature: true do
describe 'logged in' do describe 'logged in' do
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
wait_for_requests wait_for_requests
end end
......
...@@ -13,7 +13,7 @@ feature 'Issues > Labels bulk assignment', feature: true do ...@@ -13,7 +13,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
end end
context 'sidebar' do context 'sidebar' do
...@@ -346,7 +346,7 @@ feature 'Issues > Labels bulk assignment', feature: true do ...@@ -346,7 +346,7 @@ feature 'Issues > Labels bulk assignment', feature: true do
context 'as a guest' do context 'as a guest' do
before do before do
gitlab_sign_in user sign_in user
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
end end
......
...@@ -8,7 +8,7 @@ feature 'Create Branch/Merge Request Dropdown on issue page', feature: true, js: ...@@ -8,7 +8,7 @@ feature 'Create Branch/Merge Request Dropdown on issue page', feature: true, js:
context 'for team members' do context 'for team members' do
before do before do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
end end
it 'allows creating a merge request from the issue page' do it 'allows creating a merge request from the issue page' do
......
...@@ -9,7 +9,7 @@ feature 'Resolving all open discussions in a merge request from an issue', featu ...@@ -9,7 +9,7 @@ feature 'Resolving all open discussions in a merge request from an issue', featu
describe 'as a user with access to the project' do describe 'as a user with access to the project' do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
...@@ -82,7 +82,7 @@ feature 'Resolving all open discussions in a merge request from an issue', featu ...@@ -82,7 +82,7 @@ feature 'Resolving all open discussions in a merge request from an issue', featu
describe 'as a reporter' do describe 'as a reporter' do
before do before do
project.team << [user, :reporter] project.team << [user, :reporter]
gitlab_sign_in user sign_in user
visit new_namespace_project_issue_path(project.namespace, project, merge_request_to_resolve_discussions_of: merge_request.iid) visit new_namespace_project_issue_path(project.namespace, project, merge_request_to_resolve_discussions_of: merge_request.iid)
end end
......
...@@ -9,7 +9,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe ...@@ -9,7 +9,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
describe 'As a user with access to the project' do describe 'As a user with access to the project' do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
...@@ -66,7 +66,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe ...@@ -66,7 +66,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
describe 'as a reporter' do describe 'as a reporter' do
before do before do
project.team << [user, :reporter] project.team << [user, :reporter]
gitlab_sign_in user sign_in user
visit new_namespace_project_issue_path(project.namespace, project, visit new_namespace_project_issue_path(project.namespace, project,
merge_request_to_resolve_discussions_of: merge_request.iid, merge_request_to_resolve_discussions_of: merge_request.iid,
discussion_to_resolve: discussion.id) discussion_to_resolve: discussion.id)
......
...@@ -23,7 +23,7 @@ describe 'Dropdown assignee', :feature, :js do ...@@ -23,7 +23,7 @@ describe 'Dropdown assignee', :feature, :js do
project.team << [user, :master] project.team << [user, :master]
project.team << [user_john, :master] project.team << [user_john, :master]
project.team << [user_jacob, :master] project.team << [user_jacob, :master]
gitlab_sign_in(user) sign_in(user)
create(:issue, project: project) create(:issue, project: project)
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
......
...@@ -31,7 +31,7 @@ describe 'Dropdown author', js: true, feature: true do ...@@ -31,7 +31,7 @@ describe 'Dropdown author', js: true, feature: true do
project.team << [user, :master] project.team << [user, :master]
project.team << [user_john, :master] project.team << [user_john, :master]
project.team << [user_jacob, :master] project.team << [user_jacob, :master]
gitlab_sign_in(user) sign_in(user)
create(:issue, project: project) create(:issue, project: project)
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
......
...@@ -14,7 +14,7 @@ describe 'Dropdown hint', :js, :feature do ...@@ -14,7 +14,7 @@ describe 'Dropdown hint', :js, :feature do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
create(:issue, project: project) create(:issue, project: project)
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
......
...@@ -34,7 +34,7 @@ describe 'Dropdown label', js: true, feature: true do ...@@ -34,7 +34,7 @@ describe 'Dropdown label', js: true, feature: true do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
create(:issue, project: project) create(:issue, project: project)
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
......
...@@ -30,7 +30,7 @@ describe 'Dropdown milestone', :feature, :js do ...@@ -30,7 +30,7 @@ describe 'Dropdown milestone', :feature, :js do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
create(:issue, project: project) create(:issue, project: project)
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
......
...@@ -9,7 +9,7 @@ describe 'Search bar', js: true, feature: true do ...@@ -9,7 +9,7 @@ describe 'Search bar', js: true, feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
create(:issue, project: project) create(:issue, project: project)
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
......
...@@ -25,7 +25,7 @@ describe 'Visual tokens', js: true, feature: true do ...@@ -25,7 +25,7 @@ describe 'Visual tokens', js: true, feature: true do
before do before do
project.add_user(user, :master) project.add_user(user, :master)
project.add_user(user_rock, :master) project.add_user(user_rock, :master)
gitlab_sign_in(user) sign_in(user)
create(:issue, project: project) create(:issue, project: project)
visit namespace_project_issues_path(project.namespace, project) visit namespace_project_issues_path(project.namespace, project)
......
...@@ -16,7 +16,7 @@ describe 'New/edit issue', :feature, :js do ...@@ -16,7 +16,7 @@ describe 'New/edit issue', :feature, :js do
before do before do
project.team << [user, :master] project.team << [user, :master]
project.team << [user2, :master] project.team << [user2, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'new issue' do context 'new issue' do
......
...@@ -8,7 +8,7 @@ feature 'GFM autocomplete', feature: true, js: true do ...@@ -8,7 +8,7 @@ feature 'GFM autocomplete', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
wait_for_requests wait_for_requests
......
...@@ -10,7 +10,7 @@ feature 'Issue Sidebar', feature: true do ...@@ -10,7 +10,7 @@ feature 'Issue Sidebar', feature: true do
let!(:label) { create(:label, project: project, title: 'bug') } let!(:label) { create(:label, project: project, title: 'bug') }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
context 'assignee', js: true do context 'assignee', js: true do
......
...@@ -6,7 +6,7 @@ feature 'Issue markdown toolbar', feature: true, js: true do ...@@ -6,7 +6,7 @@ feature 'Issue markdown toolbar', feature: true, js: true do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
......
...@@ -9,7 +9,7 @@ feature 'issue move to another project' do ...@@ -9,7 +9,7 @@ feature 'issue move to another project' do
create(:issue, description: text, project: old_project, author: user) create(:issue, description: text, project: old_project, author: user)
end end
background { gitlab_sign_in(user) } background { sign_in(user) }
context 'user does not have permission to move issue' do context 'user does not have permission to move issue' do
background do background do
......
...@@ -27,7 +27,7 @@ feature 'Issue notes polling', :feature, :js do ...@@ -27,7 +27,7 @@ feature 'Issue notes polling', :feature, :js do
let!(:existing_note) { create(:note, noteable: issue, project: project, author: user, note: note_text) } let!(:existing_note) { create(:note, noteable: issue, project: project, author: user, note: note_text) }
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
...@@ -93,7 +93,7 @@ feature 'Issue notes polling', :feature, :js do ...@@ -93,7 +93,7 @@ feature 'Issue notes polling', :feature, :js do
let!(:existing_note) { create(:note, noteable: issue, project: project, author: user1, note: note_text) } let!(:existing_note) { create(:note, noteable: issue, project: project, author: user1, note: note_text) }
before do before do
gitlab_sign_in(user2) sign_in(user2)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
...@@ -114,7 +114,7 @@ feature 'Issue notes polling', :feature, :js do ...@@ -114,7 +114,7 @@ feature 'Issue notes polling', :feature, :js do
let!(:system_note) { create(:system_note, noteable: issue, project: project, author: user, note: note_text) } let!(:system_note) { create(:system_note, noteable: issue, project: project, author: user, note: note_text) }
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
......
...@@ -9,7 +9,7 @@ describe 'Create notes on issues', :js, :feature do ...@@ -9,7 +9,7 @@ describe 'Create notes on issues', :js, :feature do
before do before do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
fill_in 'note[note]', with: note_text fill_in 'note[note]', with: note_text
......
...@@ -18,7 +18,7 @@ describe 'New issue', feature: true, js: true do ...@@ -18,7 +18,7 @@ describe 'New issue', feature: true, js: true do
) )
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'when identified as a spam' do context 'when identified as a spam' do
......
...@@ -7,7 +7,7 @@ feature 'Manually create a todo item from issue', feature: true, js: true do ...@@ -7,7 +7,7 @@ feature 'Manually create a todo item from issue', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
......
...@@ -7,7 +7,7 @@ feature 'Multiple issue updating from issues#index', feature: true do ...@@ -7,7 +7,7 @@ feature 'Multiple issue updating from issues#index', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'status', js: true do context 'status', js: true do
......
...@@ -13,7 +13,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do ...@@ -13,7 +13,7 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
...@@ -41,8 +41,8 @@ feature 'Issues > User uses quick actions', feature: true, js: true do ...@@ -41,8 +41,8 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
gitlab_sign_out sign_out(:user)
gitlab_sign_in(guest) sign_in(guest)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
...@@ -81,8 +81,8 @@ feature 'Issues > User uses quick actions', feature: true, js: true do ...@@ -81,8 +81,8 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
gitlab_sign_out sign_out(:user)
gitlab_sign_in(guest) sign_in(guest)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
......
...@@ -571,8 +571,6 @@ describe 'Issues', feature: true do ...@@ -571,8 +571,6 @@ describe 'Issues', feature: true do
expect(current_path).to eq new_user_session_path expect(current_path).to eq new_user_session_path
# NOTE: This is specifically testing the redirect after login, so we
# need the full login flow
gitlab_sign_in(create(:user)) gitlab_sign_in(create(:user))
expect(current_path).to eq new_namespace_project_issue_path(project.namespace, project) expect(current_path).to eq new_namespace_project_issue_path(project.namespace, project)
......
...@@ -13,7 +13,7 @@ feature 'Merge request issue assignment', js: true, feature: true do ...@@ -13,7 +13,7 @@ feature 'Merge request issue assignment', js: true, feature: true do
end end
def visit_merge_request(current_user = nil) def visit_merge_request(current_user = nil)
gitlab_sign_in(current_user || user) sign_in(current_user || user)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -7,7 +7,7 @@ feature 'Merge request awards', js: true, feature: true do ...@@ -7,7 +7,7 @@ feature 'Merge request awards', js: true, feature: true do
describe 'logged in' do describe 'logged in' do
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -6,7 +6,7 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru ...@@ -6,7 +6,7 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru
let!(:merge_request) { create(:merge_request_with_diff_notes, source_project: project, author: user) } let!(:merge_request) { create(:merge_request_with_diff_notes, source_project: project, author: user) }
before do before do
gitlab_sign_in user sign_in user
project.team << [user, :master] project.team << [user, :master]
end end
......
...@@ -7,7 +7,7 @@ describe 'Cherry-pick Merge Requests', js: true do ...@@ -7,7 +7,7 @@ describe 'Cherry-pick Merge Requests', js: true do
let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) } let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user) }
before do before do
gitlab_sign_in user sign_in user
project.team << [user, :master] project.team << [user, :master]
end end
......
...@@ -20,7 +20,7 @@ feature 'Merge Request closing issues message', feature: true, js: true do ...@@ -20,7 +20,7 @@ feature 'Merge Request closing issues message', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
wait_for_requests wait_for_requests
......
...@@ -79,7 +79,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do ...@@ -79,7 +79,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do
context 'can be resolved in the UI' do context 'can be resolved in the UI' do
before do before do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
end end
context 'the conflicts are resolvable' do context 'the conflicts are resolvable' do
...@@ -164,7 +164,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do ...@@ -164,7 +164,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do
before do before do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -7,7 +7,7 @@ feature 'Create New Merge Request', feature: true, js: true do ...@@ -7,7 +7,7 @@ feature 'Create New Merge Request', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
end end
it 'selects the source branch sha when a tag with the same name exists' do it 'selects the source branch sha when a tag with the same name exists' do
......
...@@ -16,7 +16,7 @@ feature 'Merge request created from fork' do ...@@ -16,7 +16,7 @@ feature 'Merge request created from fork' do
background do background do
fork_project.team << [user, :master] fork_project.team << [user, :master]
gitlab_sign_in user sign_in user
end end
scenario 'user can access merge request' do scenario 'user can access merge request' do
......
...@@ -8,7 +8,7 @@ describe 'Deleted source branch', feature: true, js: true do ...@@ -8,7 +8,7 @@ describe 'Deleted source branch', feature: true, js: true do
let(:merge_request) { create(:merge_request) } let(:merge_request) { create(:merge_request) }
before do before do
gitlab_sign_in user sign_in user
merge_request.project.team << [user, :master] merge_request.project.team << [user, :master]
merge_request.update!(source_branch: 'this-branch-does-not-exist') merge_request.update!(source_branch: 'this-branch-does-not-exist')
visit namespace_project_merge_request_path( visit namespace_project_merge_request_path(
......
...@@ -20,7 +20,7 @@ feature 'Diff note avatars', feature: true, js: true do ...@@ -20,7 +20,7 @@ feature 'Diff note avatars', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
end end
context 'discussion tab' do context 'discussion tab' do
......
...@@ -19,7 +19,7 @@ feature 'Diff notes resolve', feature: true, js: true do ...@@ -19,7 +19,7 @@ feature 'Diff notes resolve', feature: true, js: true do
context 'no discussions' do context 'no discussions' do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
note.destroy note.destroy
visit_merge_request visit_merge_request
end end
...@@ -33,7 +33,7 @@ feature 'Diff notes resolve', feature: true, js: true do ...@@ -33,7 +33,7 @@ feature 'Diff notes resolve', feature: true, js: true do
context 'as authorized user' do context 'as authorized user' do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit_merge_request visit_merge_request
end end
...@@ -402,7 +402,7 @@ feature 'Diff notes resolve', feature: true, js: true do ...@@ -402,7 +402,7 @@ feature 'Diff notes resolve', feature: true, js: true do
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
gitlab_sign_in guest sign_in guest
end end
context 'someone elses merge request' do context 'someone elses merge request' do
......
...@@ -74,7 +74,7 @@ feature 'Diffs URL', js: true, feature: true do ...@@ -74,7 +74,7 @@ feature 'Diffs URL', js: true, feature: true do
context 'as author' do context 'as author' do
it 'shows direct edit link' do it 'shows direct edit link' do
gitlab_sign_in(author_user) sign_in(author_user)
visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request) visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
# Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax # Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax
...@@ -84,7 +84,7 @@ feature 'Diffs URL', js: true, feature: true do ...@@ -84,7 +84,7 @@ feature 'Diffs URL', js: true, feature: true do
context 'as user who needs to fork' do context 'as user who needs to fork' do
it 'shows fork/cancel confirmation' do it 'shows fork/cancel confirmation' do
gitlab_sign_in(user) sign_in(user)
visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request) visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
# Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax # Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Merge Request Discussions', feature: true do feature 'Merge Request Discussions', feature: true do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
end end
describe "Diff discussions" do describe "Diff discussions" do
......
...@@ -8,7 +8,7 @@ feature 'Edit Merge Request', feature: true do ...@@ -8,7 +8,7 @@ feature 'Edit Merge Request', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit edit_namespace_project_merge_request_path(project.namespace, project, merge_request) visit edit_namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -26,7 +26,7 @@ feature 'Issue filtering by Labels', feature: true, js: true do ...@@ -26,7 +26,7 @@ feature 'Issue filtering by Labels', feature: true, js: true do
mr3.labels << feature mr3.labels << feature
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_merge_requests_path(project.namespace, project) visit namespace_project_merge_requests_path(project.namespace, project)
end end
......
...@@ -15,7 +15,7 @@ feature 'Merge Request filtering by Milestone', feature: true do ...@@ -15,7 +15,7 @@ feature 'Merge Request filtering by Milestone', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
scenario 'filters by no Milestone', js: true do scenario 'filters by no Milestone', js: true do
......
...@@ -14,7 +14,7 @@ describe 'Filter merge requests', feature: true do ...@@ -14,7 +14,7 @@ describe 'Filter merge requests', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
group.add_developer(user) group.add_developer(user)
gitlab_sign_in(user) sign_in(user)
create(:merge_request, source_project: project, target_project: project) create(:merge_request, source_project: project, target_project: project)
visit namespace_project_merge_requests_path(project.namespace, project) visit namespace_project_merge_requests_path(project.namespace, project)
......
...@@ -18,7 +18,7 @@ describe 'New/edit merge request', feature: true, js: true do ...@@ -18,7 +18,7 @@ describe 'New/edit merge request', feature: true, js: true do
context 'owned projects' do context 'owned projects' do
before do before do
gitlab_sign_in(user) sign_in(user)
end end
context 'new merge request' do context 'new merge request' do
...@@ -177,7 +177,7 @@ describe 'New/edit merge request', feature: true, js: true do ...@@ -177,7 +177,7 @@ describe 'New/edit merge request', feature: true, js: true do
context 'forked project' do context 'forked project' do
before do before do
fork_project.team << [user, :master] fork_project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'new merge request' do context 'new merge request' do
......
...@@ -34,7 +34,7 @@ feature 'Clicking toggle commit message link', feature: true, js: true do ...@@ -34,7 +34,7 @@ feature 'Clicking toggle commit message link', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
......
...@@ -28,7 +28,7 @@ feature 'Merge immediately', :feature, :js do ...@@ -28,7 +28,7 @@ feature 'Merge immediately', :feature, :js do
end end
before do before do
gitlab_sign_in user sign_in user
visit namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request) visit namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request)
end end
......
...@@ -28,7 +28,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do ...@@ -28,7 +28,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
end end
before do before do
gitlab_sign_in user sign_in user
visit_merge_request(merge_request) visit_merge_request(merge_request)
end end
...@@ -121,7 +121,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do ...@@ -121,7 +121,7 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
end end
before do before do
gitlab_sign_in user sign_in user
visit_merge_request(merge_request) visit_merge_request(merge_request)
end end
......
...@@ -11,7 +11,7 @@ feature 'Mini Pipeline Graph', :js, :feature do ...@@ -11,7 +11,7 @@ feature 'Mini Pipeline Graph', :js, :feature do
before do before do
build.run build.run
gitlab_sign_in(user) sign_in(user)
visit_merge_request visit_merge_request
end end
......
...@@ -5,7 +5,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu ...@@ -5,7 +5,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu
let(:project) { merge_request.target_project } let(:project) { merge_request.target_project }
before do before do
gitlab_sign_in merge_request.author sign_in merge_request.author
project.team << [merge_request.author, :master] project.team << [merge_request.author, :master]
end end
......
...@@ -7,7 +7,7 @@ feature 'Pipelines for Merge Requests', feature: true, js: true do ...@@ -7,7 +7,7 @@ feature 'Pipelines for Merge Requests', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
end end
context 'with pipelines' do context 'with pipelines' do
......
...@@ -13,7 +13,7 @@ describe 'Target branch', feature: true, js: true do ...@@ -13,7 +13,7 @@ describe 'Target branch', feature: true, js: true do
end end
before do before do
gitlab_sign_in user sign_in user
project.team << [user, :master] project.team << [user, :master]
end end
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
feature 'Toggle Whitespace Changes', js: true, feature: true do feature 'Toggle Whitespace Changes', js: true, feature: true do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
merge_request = create(:merge_request) merge_request = create(:merge_request)
project = merge_request.source_project project = merge_request.source_project
visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request) visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
......
...@@ -8,7 +8,7 @@ feature 'toggler_behavior', js: true, feature: true do ...@@ -8,7 +8,7 @@ feature 'toggler_behavior', js: true, feature: true do
let(:fragment_id) { "#note_#{note.id}" } let(:fragment_id) { "#note_#{note.id}" }
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
project = merge_request.source_project project = merge_request.source_project
page.current_window.resize_to(1000, 300) page.current_window.resize_to(1000, 300)
visit "#{namespace_project_merge_request_path(project.namespace, project, merge_request)}#{fragment_id}" visit "#{namespace_project_merge_request_path(project.namespace, project, merge_request)}#{fragment_id}"
......
...@@ -7,7 +7,7 @@ feature 'Multiple merge requests updating from merge_requests#index', feature: t ...@@ -7,7 +7,7 @@ feature 'Multiple merge requests updating from merge_requests#index', feature: t
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'status', js: true do context 'status', js: true do
......
...@@ -7,7 +7,7 @@ feature 'Merge requests > User posts diff notes', :js do ...@@ -7,7 +7,7 @@ feature 'Merge requests > User posts diff notes', :js do
before do before do
project.add_developer(user) project.add_developer(user)
gitlab_sign_in(user) sign_in(user)
end end
let(:comment_button_class) { '.add-diff-note' } let(:comment_button_class) { '.add-diff-note' }
......
...@@ -13,7 +13,7 @@ describe 'Merge requests > User posts notes', :js do ...@@ -13,7 +13,7 @@ describe 'Merge requests > User posts notes', :js do
end end
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -11,7 +11,7 @@ feature 'Merge requests > User sees system notes' do ...@@ -11,7 +11,7 @@ feature 'Merge requests > User sees system notes' do
before do before do
user = create(:user) user = create(:user)
private_project.add_developer(user) private_project.add_developer(user)
gitlab_sign_in(user) sign_in(user)
end end
it 'shows the system note' do it 'shows the system note' do
......
...@@ -16,7 +16,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -16,7 +16,7 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
describe 'merge-request-only commands' do describe 'merge-request-only commands' do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
...@@ -51,8 +51,8 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -51,8 +51,8 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
gitlab_sign_out sign_out(:user)
gitlab_sign_in(guest) sign_in(guest)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
...@@ -97,8 +97,8 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -97,8 +97,8 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
gitlab_sign_out sign_out(:user)
gitlab_sign_in(guest) sign_in(guest)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
...@@ -125,9 +125,9 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -125,9 +125,9 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } } let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } }
before do before do
gitlab_sign_out sign_out(:user)
another_project.team << [user, :master] another_project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
it 'changes target_branch in new merge_request' do it 'changes target_branch in new merge_request' do
...@@ -181,8 +181,8 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do ...@@ -181,8 +181,8 @@ feature 'Merge Requests > User uses quick actions', feature: true, js: true do
let(:guest) { create(:user) } let(:guest) { create(:user) }
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
gitlab_sign_out sign_out(:user)
gitlab_sign_in(guest) sign_in(guest)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -8,7 +8,7 @@ feature 'Merge Request versions', js: true, feature: true do ...@@ -8,7 +8,7 @@ feature 'Merge Request versions', js: true, feature: true do
let!(:merge_request_diff3) { merge_request.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') } let!(:merge_request_diff3) { merge_request.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request) visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -12,7 +12,7 @@ feature 'Widget Deployments Header', feature: true, js: true do ...@@ -12,7 +12,7 @@ feature 'Widget Deployments Header', feature: true, js: true do
given!(:manual) { } given!(:manual) { }
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, role] project.team << [user, role]
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -7,7 +7,7 @@ describe 'Merge request', :feature, :js do ...@@ -7,7 +7,7 @@ describe 'Merge request', :feature, :js do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'new merge request' do context 'new merge request' do
...@@ -209,8 +209,8 @@ describe 'Merge request', :feature, :js do ...@@ -209,8 +209,8 @@ describe 'Merge request', :feature, :js do
before do before do
project.team << [user2, :master] project.team << [user2, :master]
gitlab_sign_out sign_out(:user)
gitlab_sign_in user2 sign_in(user2)
merge_request.update(target_project: fork_project) merge_request.update(target_project: fork_project)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -6,7 +6,7 @@ feature 'Work In Progress help message', feature: true do ...@@ -6,7 +6,7 @@ feature 'Work In Progress help message', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'with WIP commits' do context 'with WIP commits' do
......
...@@ -6,7 +6,7 @@ feature 'Milestone', feature: true do ...@@ -6,7 +6,7 @@ feature 'Milestone', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
feature 'Create a milestone' do feature 'Create a milestone' do
......
...@@ -9,7 +9,7 @@ describe 'Milestone show', feature: true do ...@@ -9,7 +9,7 @@ describe 'Milestone show', feature: true do
before do before do
project.add_user(user, :developer) project.add_user(user, :developer)
gitlab_sign_in(user) sign_in(user)
end end
def visit_milestone def visit_milestone
......
...@@ -8,7 +8,7 @@ feature 'Member autocomplete', :js do ...@@ -8,7 +8,7 @@ feature 'Member autocomplete', :js do
before do before do
note # actually create the note note # actually create the note
gitlab_sign_in(user) sign_in(user)
end end
shared_examples "open suggestions when typing @" do shared_examples "open suggestions when typing @" do
......
...@@ -4,7 +4,7 @@ describe 'Profile account page', feature: true do ...@@ -4,7 +4,7 @@ describe 'Profile account page', feature: true do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
describe 'when signup is enabled' do describe 'when signup is enabled' do
......
...@@ -4,7 +4,7 @@ feature 'Profile > Account', feature: true do ...@@ -4,7 +4,7 @@ feature 'Profile > Account', feature: true do
given(:user) { create(:user, username: 'foo') } given(:user) { create(:user, username: 'foo') }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
describe 'Change username' do describe 'Change username' do
......
...@@ -5,7 +5,7 @@ feature 'Profile > Chat', feature: true do ...@@ -5,7 +5,7 @@ feature 'Profile > Chat', feature: true do
given(:service) { create(:service) } given(:service) { create(:service) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
describe 'uses authorization link' do describe 'uses authorization link' do
......
...@@ -4,7 +4,7 @@ feature 'Profile > SSH Keys', feature: true do ...@@ -4,7 +4,7 @@ feature 'Profile > SSH Keys', feature: true do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
describe 'User adds a key' do describe 'User adds a key' do
......
...@@ -4,7 +4,7 @@ describe 'Profile > Applications', feature: true do ...@@ -4,7 +4,7 @@ describe 'Profile > Applications', feature: true do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
describe 'User manages applications', js: true do describe 'User manages applications', js: true do
......
...@@ -4,7 +4,7 @@ describe 'Profile > Password', feature: true do ...@@ -4,7 +4,7 @@ describe 'Profile > Password', feature: true do
let(:user) { create(:user, password_automatically_set: true) } let(:user) { create(:user, password_automatically_set: true) }
before do before do
gitlab_sign_in(user) sign_in(user)
visit edit_profile_password_path visit edit_profile_password_path
end end
......
...@@ -23,7 +23,7 @@ describe 'Profile > Personal Access Tokens', feature: true, js: true do ...@@ -23,7 +23,7 @@ describe 'Profile > Personal Access Tokens', feature: true, js: true do
end end
before do before do
gitlab_sign_in(user) sign_in(user)
end end
describe "token creation" do describe "token creation" do
......
...@@ -4,7 +4,7 @@ describe 'Profile > Preferences', feature: true do ...@@ -4,7 +4,7 @@ describe 'Profile > Preferences', feature: true do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
gitlab_sign_in(user) sign_in(user)
visit profile_preferences_path visit profile_preferences_path
end end
......
...@@ -4,7 +4,7 @@ feature 'Profile > Notifications > User changes notified_of_own_activity setting ...@@ -4,7 +4,7 @@ feature 'Profile > Notifications > User changes notified_of_own_activity setting
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
scenario 'User opts into receiving notifications about their own activity' do scenario 'User opts into receiving notifications about their own activity' do
......
require 'spec_helper' require 'spec_helper'
feature 'Project Activity RSS' do feature 'Project Activity RSS' do
let(:user) { create(:user) }
let(:project) { create(:empty_project, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } let(:project) { create(:empty_project, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
let(:path) { activity_namespace_project_path(project.namespace, project) } let(:path) { activity_namespace_project_path(project.namespace, project) }
...@@ -10,9 +11,8 @@ feature 'Project Activity RSS' do ...@@ -10,9 +11,8 @@ feature 'Project Activity RSS' do
context 'when signed in' do context 'when signed in' do
before do before do
user = create(:user)
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
visit path visit path
end end
......
...@@ -7,7 +7,7 @@ feature 'test coverage badge' do ...@@ -7,7 +7,7 @@ feature 'test coverage badge' do
context 'when user has access to view badge' do context 'when user has access to view badge' do
background do background do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
end end
scenario 'user requests coverage badge image for pipeline' do scenario 'user requests coverage badge image for pipeline' do
...@@ -45,7 +45,7 @@ feature 'test coverage badge' do ...@@ -45,7 +45,7 @@ feature 'test coverage badge' do
end end
context 'when user does not have access to view badge' do context 'when user does not have access to view badge' do
background { gitlab_sign_in(user) } background { sign_in(user) }
scenario 'user requests test coverage badge image' do scenario 'user requests test coverage badge image' do
show_test_coverage_badge show_test_coverage_badge
......
...@@ -5,7 +5,7 @@ feature 'list of badges' do ...@@ -5,7 +5,7 @@ feature 'list of badges' do
user = create(:user) user = create(:user)
project = create(:project) project = create(:project)
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_pipelines_settings_path(project.namespace, project) visit namespace_project_pipelines_settings_path(project.namespace, project)
end end
......
...@@ -14,7 +14,7 @@ feature 'Editing file blob', feature: true, js: true do ...@@ -14,7 +14,7 @@ feature 'Editing file blob', feature: true, js: true do
before do before do
project.team << [user, role] project.team << [user, role]
gitlab_sign_in(user) sign_in(user)
end end
def edit_and_commit def edit_and_commit
...@@ -92,7 +92,7 @@ feature 'Editing file blob', feature: true, js: true do ...@@ -92,7 +92,7 @@ feature 'Editing file blob', feature: true, js: true do
project.team << [user, :developer] project.team << [user, :developer]
project.repository.add_branch(user, protected_branch, 'master') project.repository.add_branch(user, protected_branch, 'master')
create(:protected_branch, project: project, name: protected_branch) create(:protected_branch, project: project, name: protected_branch)
gitlab_sign_in(user) sign_in(user)
end end
context 'on some branch' do context 'on some branch' do
...@@ -122,7 +122,7 @@ feature 'Editing file blob', feature: true, js: true do ...@@ -122,7 +122,7 @@ feature 'Editing file blob', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_edit_blob_path(project.namespace, project, tree_join(branch, file_path)) visit namespace_project_edit_blob_path(project.namespace, project, tree_join(branch, file_path))
end end
......
...@@ -22,7 +22,7 @@ feature 'Download buttons in branches page', feature: true do ...@@ -22,7 +22,7 @@ feature 'Download buttons in branches page', feature: true do
end end
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, role] project.team << [user, role]
end end
......
...@@ -8,7 +8,7 @@ describe 'New Branch Ref Dropdown', :js, :feature do ...@@ -8,7 +8,7 @@ describe 'New Branch Ref Dropdown', :js, :feature do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit new_namespace_project_branch_path(project.namespace, project) visit new_namespace_project_branch_path(project.namespace, project)
end end
......
...@@ -6,7 +6,7 @@ feature 'project commit pipelines', js: true do ...@@ -6,7 +6,7 @@ feature 'project commit pipelines', js: true do
background do background do
user = create(:user) user = create(:user)
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'when no builds triggered yet' do context 'when no builds triggered yet' do
......
...@@ -5,7 +5,7 @@ feature 'Mini Pipeline Graph in Commit View', :js, :feature do ...@@ -5,7 +5,7 @@ feature 'Mini Pipeline Graph in Commit View', :js, :feature do
let(:project) { create(:project, :public) } let(:project) { create(:project, :public) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
context 'when commit has pipelines' do context 'when commit has pipelines' do
......
require 'spec_helper' require 'spec_helper'
feature 'Project Commits RSS' do feature 'Project Commits RSS' do
let(:user) { create(:user) }
let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
let(:path) { namespace_project_commits_path(project.namespace, project, :master) } let(:path) { namespace_project_commits_path(project.namespace, project, :master) }
context 'when signed in' do context 'when signed in' do
before do before do
user = create(:user)
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
visit path visit path
end end
......
...@@ -6,7 +6,7 @@ describe "Compare", js: true do ...@@ -6,7 +6,7 @@ describe "Compare", js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_compare_index_path(project.namespace, project, from: "master", to: "master") visit namespace_project_compare_index_path(project.namespace, project, from: "master", to: "master")
end end
......
...@@ -6,7 +6,7 @@ describe 'Project deploy keys', :js, :feature do ...@@ -6,7 +6,7 @@ describe 'Project deploy keys', :js, :feature do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
describe 'removing key' do describe 'removing key' do
......
...@@ -7,7 +7,7 @@ feature 'Developer views empty project instructions', feature: true do ...@@ -7,7 +7,7 @@ feature 'Developer views empty project instructions', feature: true do
background do background do
project.team << [developer, :developer] project.team << [developer, :developer]
gitlab_sign_in(developer) sign_in(developer)
end end
context 'without an SSH key' do context 'without an SSH key' do
......
...@@ -6,7 +6,7 @@ feature 'Project edit', feature: true, js: true do ...@@ -6,7 +6,7 @@ feature 'Project edit', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit edit_namespace_project_path(project.namespace, project) visit edit_namespace_project_path(project.namespace, project)
end end
......
...@@ -15,7 +15,7 @@ feature 'Environment > Metrics', :feature do ...@@ -15,7 +15,7 @@ feature 'Environment > Metrics', :feature do
create(:deployment, environment: environment, deployable: build) create(:deployment, environment: environment, deployable: build)
stub_all_prometheus_requests(environment.slug) stub_all_prometheus_requests(environment.slug)
gitlab_sign_in(user) sign_in(user)
visit_environment(environment) visit_environment(environment)
end end
......
...@@ -6,7 +6,7 @@ feature 'Environment', :feature do ...@@ -6,7 +6,7 @@ feature 'Environment', :feature do
given(:role) { :developer } given(:role) { :developer }
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, role] project.team << [user, role]
end end
......
...@@ -7,7 +7,7 @@ feature 'Environments page', :feature, :js do ...@@ -7,7 +7,7 @@ feature 'Environments page', :feature, :js do
background do background do
project.team << [user, role] project.team << [user, role]
gitlab_sign_in(user) sign_in(user)
end end
given!(:environment) { } given!(:environment) { }
......
...@@ -9,7 +9,7 @@ describe 'Edit Project Settings', feature: true do ...@@ -9,7 +9,7 @@ describe 'Edit Project Settings', feature: true do
describe 'project features visibility selectors', js: true do describe 'project features visibility selectors', js: true do
before do before do
project.team << [member, :master] project.team << [member, :master]
gitlab_sign_in(member) sign_in(member)
end end
tools = { builds: "pipelines", issues: "issues", wiki: "wiki", snippets: "snippets", merge_requests: "merge_requests" } tools = { builds: "pipelines", issues: "issues", wiki: "wiki", snippets: "snippets", merge_requests: "merge_requests" }
...@@ -83,7 +83,7 @@ describe 'Edit Project Settings', feature: true do ...@@ -83,7 +83,7 @@ describe 'Edit Project Settings', feature: true do
context 'normal user' do context 'normal user' do
before do before do
gitlab_sign_in(member) sign_in(member)
end end
it 'renders 200 if tool is enabled' do it 'renders 200 if tool is enabled' do
...@@ -130,7 +130,7 @@ describe 'Edit Project Settings', feature: true do ...@@ -130,7 +130,7 @@ describe 'Edit Project Settings', feature: true do
context 'admin user' do context 'admin user' do
before do before do
non_member.update_attribute(:admin, true) non_member.update_attribute(:admin, true)
gitlab_sign_in(non_member) sign_in(non_member)
end end
it 'renders 404 if feature is disabled' do it 'renders 404 if feature is disabled' do
...@@ -156,7 +156,7 @@ describe 'Edit Project Settings', feature: true do ...@@ -156,7 +156,7 @@ describe 'Edit Project Settings', feature: true do
describe 'repository visibility', js: true do describe 'repository visibility', js: true do
before do before do
project.team << [member, :master] project.team << [member, :master]
gitlab_sign_in(member) sign_in(member)
visit edit_namespace_project_path(project.namespace, project) visit edit_namespace_project_path(project.namespace, project)
end end
...@@ -242,7 +242,7 @@ describe 'Edit Project Settings', feature: true do ...@@ -242,7 +242,7 @@ describe 'Edit Project Settings', feature: true do
before do before do
project.team << [member, :guest] project.team << [member, :guest]
gitlab_sign_in(member) sign_in(member)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -6,7 +6,7 @@ feature 'user browses project', feature: true, js: true do ...@@ -6,7 +6,7 @@ feature 'user browses project', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_tree_path(project.namespace, project, project.default_branch) visit namespace_project_tree_path(project.namespace, project, project.default_branch)
end end
......
...@@ -6,7 +6,7 @@ feature 'User wants to create a file', feature: true do ...@@ -6,7 +6,7 @@ feature 'User wants to create a file', feature: true do
background do background do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_new_blob_path(project.namespace, project, project.default_branch) visit namespace_project_new_blob_path(project.namespace, project, project.default_branch)
end end
......
...@@ -7,7 +7,7 @@ feature 'User wants to add a Dockerfile file', feature: true do ...@@ -7,7 +7,7 @@ feature 'User wants to add a Dockerfile file', feature: true do
project = create(:project) project = create(:project)
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: 'Dockerfile') visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: 'Dockerfile')
end end
......
...@@ -22,7 +22,7 @@ feature 'Download buttons in files tree', feature: true do ...@@ -22,7 +22,7 @@ feature 'Download buttons in files tree', feature: true do
end end
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, role] project.team << [user, role]
end end
......
...@@ -5,7 +5,7 @@ feature 'User uses soft wrap whilst editing file', feature: true, js: true do ...@@ -5,7 +5,7 @@ feature 'User uses soft wrap whilst editing file', feature: true, js: true do
user = create(:user) user = create(:user)
project = create(:project) project = create(:project)
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: 'test_file-name') visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: 'test_file-name')
editor = find('.file-editor.code') editor = find('.file-editor.code')
editor.click editor.click
......
...@@ -17,7 +17,7 @@ feature 'User wants to edit a file', feature: true do ...@@ -17,7 +17,7 @@ feature 'User wants to edit a file', feature: true do
background do background do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_edit_blob_path(project.namespace, project, visit namespace_project_edit_blob_path(project.namespace, project,
File.join(project.default_branch, '.gitignore')) File.join(project.default_branch, '.gitignore'))
end end
......
...@@ -6,7 +6,7 @@ feature 'User views files page', feature: true do ...@@ -6,7 +6,7 @@ feature 'User views files page', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_tree_path(project.namespace, project, project.repository.root_ref) visit namespace_project_tree_path(project.namespace, project, project.repository.root_ref)
end end
......
...@@ -6,7 +6,7 @@ feature 'Find file keyboard shortcuts', feature: true, js: true do ...@@ -6,7 +6,7 @@ feature 'Find file keyboard shortcuts', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_find_file_path(project.namespace, project, project.repository.root_ref) visit namespace_project_find_file_path(project.namespace, project, project.repository.root_ref)
......
...@@ -5,7 +5,7 @@ feature 'Find files button in the tree header', feature: true do ...@@ -5,7 +5,7 @@ feature 'Find files button in the tree header', feature: true do
given(:project) { create(:project) } given(:project) { create(:project) }
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, :developer] project.team << [user, :developer]
end end
......
...@@ -5,7 +5,7 @@ feature 'User wants to add a .gitignore file', feature: true do ...@@ -5,7 +5,7 @@ feature 'User wants to add a .gitignore file', feature: true do
user = create(:user) user = create(:user)
project = create(:project) project = create(:project)
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: '.gitignore') visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: '.gitignore')
end end
......
...@@ -5,7 +5,7 @@ feature 'User wants to add a .gitlab-ci.yml file', feature: true do ...@@ -5,7 +5,7 @@ feature 'User wants to add a .gitlab-ci.yml file', feature: true do
user = create(:user) user = create(:user)
project = create(:project) project = create(:project)
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: '.gitlab-ci.yml') visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: '.gitlab-ci.yml')
end end
......
...@@ -7,7 +7,7 @@ feature 'project owner creates a license file', feature: true, js: true do ...@@ -7,7 +7,7 @@ feature 'project owner creates a license file', feature: true, js: true do
project.repository.delete_file(project_master, 'LICENSE', project.repository.delete_file(project_master, 'LICENSE',
message: 'Remove LICENSE', branch_name: 'master') message: 'Remove LICENSE', branch_name: 'master')
project.team << [project_master, :master] project.team << [project_master, :master]
gitlab_sign_in(project_master) sign_in(project_master)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -5,7 +5,7 @@ feature 'project owner sees a link to create a license file in empty project', f ...@@ -5,7 +5,7 @@ feature 'project owner sees a link to create a license file in empty project', f
let(:project) { create(:empty_project) } let(:project) { create(:empty_project) }
background do background do
project.team << [project_master, :master] project.team << [project_master, :master]
gitlab_sign_in(project_master) sign_in(project_master)
end end
scenario 'project master creates a license file from a template' do scenario 'project master creates a license file from a template' do
......
...@@ -6,7 +6,7 @@ feature 'Template type dropdown selector', js: true do ...@@ -6,7 +6,7 @@ feature 'Template type dropdown selector', js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
end end
context 'editing a non-matching file' do context 'editing a non-matching file' do
......
...@@ -6,7 +6,7 @@ feature 'Template Undo Button', js: true do ...@@ -6,7 +6,7 @@ feature 'Template Undo Button', js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
end end
context 'editing a matching file and applying a template' do context 'editing a matching file and applying a template' do
......
...@@ -4,7 +4,7 @@ describe 'GFM autocomplete loading', feature: true, js: true do ...@@ -4,7 +4,7 @@ describe 'GFM autocomplete loading', feature: true, js: true do
let(:project) { create(:project) } let(:project) { create(:project) }
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -9,7 +9,7 @@ feature 'Project group links', :feature, :js do ...@@ -9,7 +9,7 @@ feature 'Project group links', :feature, :js do
background do background do
project.add_master(master) project.add_master(master)
gitlab_sign_in(master) sign_in(master)
end end
context 'setting an expiration date for a group link' do context 'setting an expiration date for a group link' do
......
...@@ -7,7 +7,7 @@ describe 'Guest navigation menu' do ...@@ -7,7 +7,7 @@ describe 'Guest navigation menu' do
before do before do
project.team << [guest, :guest] project.team << [guest, :guest]
gitlab_sign_in(guest) sign_in(guest)
end end
it 'shows allowed tabs only' do it 'shows allowed tabs only' do
......
...@@ -33,7 +33,7 @@ feature 'Import/Export - project export integration test', feature: true, js: tr ...@@ -33,7 +33,7 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
context 'admin user' do context 'admin user' do
before do before do
gitlab_sign_in(user) sign_in(user)
end end
scenario 'exports a project successfully' do scenario 'exports a project successfully' do
......
...@@ -53,7 +53,6 @@ feature 'Import/Export - project import integration test', feature: true, js: tr ...@@ -53,7 +53,6 @@ feature 'Import/Export - project import integration test', feature: true, js: tr
select2(namespace.id, from: '#project_namespace_id') select2(namespace.id, from: '#project_namespace_id')
fill_in :project_path, with: project.name, visible: true fill_in :project_path, with: project.name, visible: true
click_link 'GitLab export' click_link 'GitLab export'
attach_file('file', file) attach_file('file', file)
click_on 'Import project' click_on 'Import project'
......
...@@ -16,7 +16,7 @@ feature 'Import/Export - Namespace export file cleanup', feature: true, js: true ...@@ -16,7 +16,7 @@ feature 'Import/Export - Namespace export file cleanup', feature: true, js: true
context 'admin user' do context 'admin user' do
before do before do
gitlab_sign_in(:admin) sign_in(create(:admin))
end end
context 'moving the namespace' do context 'moving the namespace' do
......
...@@ -6,7 +6,7 @@ feature 'issuable templates', feature: true, js: true do ...@@ -6,7 +6,7 @@ feature 'issuable templates', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
end end
context 'user creates an issue using templates' do context 'user creates an issue using templates' do
...@@ -124,17 +124,21 @@ feature 'issuable templates', feature: true, js: true do ...@@ -124,17 +124,21 @@ feature 'issuable templates', feature: true, js: true do
let(:merge_request) { create(:merge_request, :with_diffs, source_project: fork_project, target_project: project) } let(:merge_request) { create(:merge_request, :with_diffs, source_project: fork_project, target_project: project) }
background do background do
gitlab_sign_out sign_out(:user)
project.team << [fork_user, :developer] project.team << [fork_user, :developer]
fork_project.team << [fork_user, :master] fork_project.team << [fork_user, :master]
create(:forked_project_link, forked_to_project: fork_project, forked_from_project: project) create(:forked_project_link, forked_to_project: fork_project, forked_from_project: project)
gitlab_sign_in fork_user
sign_in(fork_user)
project.repository.create_file( project.repository.create_file(
fork_user, fork_user,
'.gitlab/merge_request_templates/feature-proposal.md', '.gitlab/merge_request_templates/feature-proposal.md',
template_content, template_content,
message: 'added merge request template', message: 'added merge request template',
branch_name: 'master') branch_name: 'master')
visit edit_namespace_project_merge_request_path project.namespace, project, merge_request visit edit_namespace_project_merge_request_path project.namespace, project, merge_request
fill_in :'merge_request[title]', with: 'test merge request title' fill_in :'merge_request[title]', with: 'test merge request title'
end end
......
...@@ -7,7 +7,7 @@ feature 'Issues List' do ...@@ -7,7 +7,7 @@ feature 'Issues List' do
background do background do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
end end
scenario 'user does not see create new list button' do scenario 'user does not see create new list button' do
......
...@@ -9,10 +9,11 @@ feature 'Project Issues RSS' do ...@@ -9,10 +9,11 @@ feature 'Project Issues RSS' do
end end
context 'when signed in' do context 'when signed in' do
let(:user) { create(:user) }
before do before do
user = create(:user)
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
visit path visit path
end end
......
...@@ -17,7 +17,7 @@ feature 'Jobs', :feature do ...@@ -17,7 +17,7 @@ feature 'Jobs', :feature do
before do before do
project.team << [user, user_access_level] project.team << [user, user_access_level]
gitlab_sign_in(user) sign_in(user)
end end
describe "GET /:project/jobs" do describe "GET /:project/jobs" do
...@@ -393,7 +393,7 @@ feature 'Jobs', :feature do ...@@ -393,7 +393,7 @@ feature 'Jobs', :feature do
project.update(visibility_level: Gitlab::VisibilityLevel::PUBLIC) project.update(visibility_level: Gitlab::VisibilityLevel::PUBLIC)
gitlab_sign_out_direct gitlab_sign_out_direct
gitlab_sign_in(create(:user)) sign_in(create(:user))
visit namespace_project_job_path(project.namespace, project, job) visit namespace_project_job_path(project.namespace, project, job)
end end
......
...@@ -28,7 +28,7 @@ feature 'Issue prioritization', feature: true do ...@@ -28,7 +28,7 @@ feature 'Issue prioritization', feature: true do
issue_2.labels << label_4 issue_2.labels << label_4
issue_1.labels << label_5 issue_1.labels << label_5
gitlab_sign_in user sign_in user
visit namespace_project_issues_path(project.namespace, project, sort: 'label_priority') visit namespace_project_issues_path(project.namespace, project, sort: 'label_priority')
# Ensure we are indicating that issues are sorted by priority # Ensure we are indicating that issues are sorted by priority
...@@ -67,7 +67,7 @@ feature 'Issue prioritization', feature: true do ...@@ -67,7 +67,7 @@ feature 'Issue prioritization', feature: true do
issue_4.labels << label_4 # 7 issue_4.labels << label_4 # 7
issue_6.labels << label_5 # 8 - No priority issue_6.labels << label_5 # 8 - No priority
gitlab_sign_in user sign_in user
visit namespace_project_issues_path(project.namespace, project, sort: 'label_priority') visit namespace_project_issues_path(project.namespace, project, sort: 'label_priority')
expect(page).to have_selector('.dropdown-toggle', text: 'Label priority') expect(page).to have_selector('.dropdown-toggle', text: 'Label priority')
......
...@@ -10,7 +10,7 @@ feature 'Labels subscription', feature: true do ...@@ -10,7 +10,7 @@ feature 'Labels subscription', feature: true do
context 'when signed in' do context 'when signed in' do
before do before do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in user sign_in user
end end
scenario 'users can subscribe/unsubscribe to labels', js: true do scenario 'users can subscribe/unsubscribe to labels', js: true do
......
...@@ -14,7 +14,7 @@ feature 'Prioritize labels', feature: true do ...@@ -14,7 +14,7 @@ feature 'Prioritize labels', feature: true do
before do before do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in user sign_in user
end end
scenario 'user can prioritize a group label', js: true do scenario 'user can prioritize a group label', js: true do
...@@ -120,7 +120,7 @@ feature 'Prioritize labels', feature: true do ...@@ -120,7 +120,7 @@ feature 'Prioritize labels', feature: true do
it 'does not prioritize labels' do it 'does not prioritize labels' do
guest = create(:user) guest = create(:user)
gitlab_sign_in guest sign_in guest
visit namespace_project_labels_path(project.namespace, project) visit namespace_project_labels_path(project.namespace, project)
......
...@@ -22,7 +22,7 @@ feature 'Download buttons in project main page', feature: true do ...@@ -22,7 +22,7 @@ feature 'Download buttons in project main page', feature: true do
end end
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, role] project.team << [user, role]
end end
......
require 'spec_helper' require 'spec_helper'
feature 'Project RSS' do feature 'Project RSS' do
let(:user) { create(:user) }
let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
let(:path) { namespace_project_path(project.namespace, project) } let(:path) { namespace_project_path(project.namespace, project) }
context 'when signed in' do context 'when signed in' do
before do before do
user = create(:user)
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
visit path visit path
end end
......
...@@ -9,7 +9,7 @@ feature 'Projects > Members > Anonymous user sees members', feature: true, js: t ...@@ -9,7 +9,7 @@ feature 'Projects > Members > Anonymous user sees members', feature: true, js: t
project.team << [user, :master] project.team << [user, :master]
@group_link = create(:project_group_link, project: project, group: group) @group_link = create(:project_group_link, project: project, group: group)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_settings_members_path(project.namespace, project) visit namespace_project_settings_members_path(project.namespace, project)
end end
......
...@@ -7,7 +7,7 @@ feature 'Projects > Members > Group member cannot leave group project', feature: ...@@ -7,7 +7,7 @@ feature 'Projects > Members > Group member cannot leave group project', feature:
background do background do
group.add_developer(user) group.add_developer(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -41,7 +41,7 @@ feature 'Projects > Members > Group member cannot request access to his group pr ...@@ -41,7 +41,7 @@ feature 'Projects > Members > Group member cannot request access to his group pr
end end
def login_and_visit_project_page(user) def login_and_visit_project_page(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
end end
...@@ -13,7 +13,7 @@ feature 'Projects members', feature: true do ...@@ -13,7 +13,7 @@ feature 'Projects members', feature: true do
background do background do
project.team << [developer, :developer] project.team << [developer, :developer]
group.add_owner(user) group.add_owner(user)
gitlab_sign_in(user) sign_in(user)
end end
context 'with a group invitee' do context 'with a group invitee' do
......
...@@ -8,7 +8,7 @@ feature 'Projects > Members > Group requester cannot request access to project', ...@@ -8,7 +8,7 @@ feature 'Projects > Members > Group requester cannot request access to project',
background do background do
group.add_owner(owner) group.add_owner(owner)
gitlab_sign_in(user) sign_in(user)
visit group_path(group) visit group_path(group)
perform_enqueued_jobs { click_link 'Request Access' } perform_enqueued_jobs { click_link 'Request Access' }
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
......
...@@ -9,7 +9,7 @@ feature 'Project members list', feature: true do ...@@ -9,7 +9,7 @@ feature 'Project members list', feature: true do
let(:project) { create(:project, namespace: group) } let(:project) { create(:project, namespace: group) }
background do background do
gitlab_sign_in(user1) sign_in(user1)
group.add_owner(user1) group.add_owner(user1)
end end
......
...@@ -10,7 +10,7 @@ feature 'Projects > Members > Master adds member with expiration date', feature: ...@@ -10,7 +10,7 @@ feature 'Projects > Members > Master adds member with expiration date', feature:
background do background do
project.team << [master, :master] project.team << [master, :master]
gitlab_sign_in(master) sign_in(master)
end end
scenario 'expiration date is displayed in the members list' do scenario 'expiration date is displayed in the members list' do
......
...@@ -8,7 +8,7 @@ feature 'Projects > Members > Master manages access requests', feature: true do ...@@ -8,7 +8,7 @@ feature 'Projects > Members > Master manages access requests', feature: true do
background do background do
project.request_access(user) project.request_access(user)
project.team << [master, :master] project.team << [master, :master]
gitlab_sign_in(master) sign_in(master)
end end
scenario 'master can see access requests' do scenario 'master can see access requests' do
......
...@@ -6,7 +6,7 @@ feature 'Projects > Members > Member cannot request access to his project', feat ...@@ -6,7 +6,7 @@ feature 'Projects > Members > Member cannot request access to his project', feat
background do background do
project.team << [member, :developer] project.team << [member, :developer]
gitlab_sign_in(member) sign_in(member)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -6,7 +6,7 @@ feature 'Projects > Members > Member leaves project', feature: true do ...@@ -6,7 +6,7 @@ feature 'Projects > Members > Member leaves project', feature: true do
background do background do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -4,7 +4,7 @@ feature 'Projects > Members > Owner cannot leave project', feature: true do ...@@ -4,7 +4,7 @@ feature 'Projects > Members > Owner cannot leave project', feature: true do
let(:project) { create(:project) } let(:project) { create(:project) }
background do background do
gitlab_sign_in(project.owner) sign_in(project.owner)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -4,7 +4,7 @@ feature 'Projects > Members > Owner cannot request access to his project', featu ...@@ -4,7 +4,7 @@ feature 'Projects > Members > Owner cannot request access to his project', featu
let(:project) { create(:project) } let(:project) { create(:project) }
background do background do
gitlab_sign_in(project.owner) sign_in(project.owner)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -8,7 +8,7 @@ feature 'Projects > Members > Sorting', feature: true do ...@@ -8,7 +8,7 @@ feature 'Projects > Members > Sorting', feature: true do
background do background do
create(:project_member, :developer, user: developer, project: project, created_at: 3.days.ago) create(:project_member, :developer, user: developer, project: project, created_at: 3.days.ago)
gitlab_sign_in(master) sign_in(master)
end end
scenario 'sorts alphabetically by default' do scenario 'sorts alphabetically by default' do
......
...@@ -6,7 +6,7 @@ feature 'Projects > Members > User requests access', feature: true do ...@@ -6,7 +6,7 @@ feature 'Projects > Members > User requests access', feature: true do
let(:master) { project.owner } let(:master) { project.owner }
background do background do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -18,7 +18,7 @@ feature 'Merge Request button', feature: true do ...@@ -18,7 +18,7 @@ feature 'Merge Request button', feature: true do
context 'logged in as developer' do context 'logged in as developer' do
before do before do
gitlab_sign_in(user) sign_in(user)
project.team << [user, :developer] project.team << [user, :developer]
end end
...@@ -52,7 +52,7 @@ feature 'Merge Request button', feature: true do ...@@ -52,7 +52,7 @@ feature 'Merge Request button', feature: true do
context 'logged in as non-member' do context 'logged in as non-member' do
before do before do
gitlab_sign_in(user) sign_in(user)
end end
it 'does not show Create merge request button' do it 'does not show Create merge request button' do
......
...@@ -7,7 +7,7 @@ feature 'Merge Requests List' do ...@@ -7,7 +7,7 @@ feature 'Merge Requests List' do
background do background do
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
end end
scenario 'user does not see create new list button' do scenario 'user does not see create new list button' do
......
...@@ -6,7 +6,7 @@ feature 'Project milestone', :feature do ...@@ -6,7 +6,7 @@ feature 'Project milestone', :feature do
let(:milestone) { create(:milestone, project: project) } let(:milestone) { create(:milestone, project: project) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
context 'when project has enabled issues' do context 'when project has enabled issues' do
......
...@@ -15,7 +15,7 @@ feature 'Milestones sorting', :feature, :js do ...@@ -15,7 +15,7 @@ feature 'Milestones sorting', :feature, :js do
due_date: 11.days.from_now, due_date: 11.days.from_now,
created_at: 1.hour.ago, created_at: 1.hour.ago,
title: "bbb", project: project) title: "bbb", project: project)
gitlab_sign_in(user) sign_in(user)
end end
scenario 'visit project milestones and sort by due_date_asc' do scenario 'visit project milestones and sort by due_date_asc' do
......
...@@ -4,7 +4,7 @@ feature "New project", feature: true do ...@@ -4,7 +4,7 @@ feature "New project", feature: true do
let(:user) { create(:admin) } let(:user) { create(:admin) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
context "Visibility level selector" do context "Visibility level selector" do
......
...@@ -10,7 +10,7 @@ feature 'Pages', feature: true do ...@@ -10,7 +10,7 @@ feature 'Pages', feature: true do
project.team << [user, role] project.team << [user, role]
gitlab_sign_in(user) sign_in(user)
end end
shared_examples 'no pages deployed' do shared_examples 'no pages deployed' do
......
...@@ -12,7 +12,7 @@ feature 'Pipeline Schedules', :feature do ...@@ -12,7 +12,7 @@ feature 'Pipeline Schedules', :feature do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit_page visit_page
end end
......
...@@ -7,7 +7,7 @@ describe 'Pipeline', :feature, :js do ...@@ -7,7 +7,7 @@ describe 'Pipeline', :feature, :js do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
gitlab_sign_in(user) sign_in(user)
project.team << [user, :developer] project.team << [user, :developer]
end end
......
...@@ -7,7 +7,7 @@ describe 'Pipelines', :feature, :js do ...@@ -7,7 +7,7 @@ describe 'Pipelines', :feature, :js do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
gitlab_sign_in(user) sign_in(user)
project.team << [user, :developer] project.team << [user, :developer]
end end
......
...@@ -7,7 +7,7 @@ describe 'Edit Project Settings', feature: true do ...@@ -7,7 +7,7 @@ describe 'Edit Project Settings', feature: true do
let(:project) { create(:empty_project, namespace: user.namespace, path: 'gitlab', name: 'sample') } let(:project) { create(:empty_project, namespace: user.namespace, path: 'gitlab', name: 'sample') }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
describe 'Project settings section', js: true do describe 'Project settings section', js: true do
......
...@@ -6,7 +6,7 @@ feature 'Ref switcher', feature: true, js: true do ...@@ -6,7 +6,7 @@ feature 'Ref switcher', feature: true, js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_tree_path(project.namespace, project, 'master') visit namespace_project_tree_path(project.namespace, project, 'master')
end end
......
...@@ -24,7 +24,7 @@ feature 'Setup Jira service', :feature, :js do ...@@ -24,7 +24,7 @@ feature 'Setup Jira service', :feature, :js do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_settings_integrations_path(project.namespace, project) visit namespace_project_settings_integrations_path(project.namespace, project)
end end
......
...@@ -9,7 +9,7 @@ feature 'Setup Mattermost slash commands', :feature, :js do ...@@ -9,7 +9,7 @@ feature 'Setup Mattermost slash commands', :feature, :js do
before do before do
stub_mattermost_setting(enabled: mattermost_enabled) stub_mattermost_setting(enabled: mattermost_enabled)
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit edit_namespace_project_service_path(project.namespace, project, service) visit edit_namespace_project_service_path(project.namespace, project, service)
end end
......
...@@ -9,7 +9,7 @@ feature 'Projects > Slack service > Setup events', feature: true do ...@@ -9,7 +9,7 @@ feature 'Projects > Slack service > Setup events', feature: true do
service.fields service.fields
service.update_attributes(push_channel: 1, issue_channel: 2, merge_request_channel: 3, note_channel: 4, tag_push_channel: 5, pipeline_channel: 6, wiki_page_channel: 7) service.update_attributes(push_channel: 1, issue_channel: 2, merge_request_channel: 3, note_channel: 4, tag_push_channel: 5, pipeline_channel: 6, wiki_page_channel: 7)
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
scenario 'user can filter events by channel' do scenario 'user can filter events by channel' do
......
...@@ -7,7 +7,7 @@ feature 'Slack slash commands', feature: true do ...@@ -7,7 +7,7 @@ feature 'Slack slash commands', feature: true do
background do background do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit edit_namespace_project_service_path(project.namespace, project, service) visit edit_namespace_project_service_path(project.namespace, project, service)
end end
......
...@@ -7,7 +7,7 @@ feature 'Integration settings', feature: true do ...@@ -7,7 +7,7 @@ feature 'Integration settings', feature: true do
let(:integrations_path) { namespace_project_settings_integrations_path(project.namespace, project) } let(:integrations_path) { namespace_project_settings_integrations_path(project.namespace, project) }
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, role] project.team << [user, role]
end end
......
...@@ -8,7 +8,7 @@ feature 'Project settings > Merge Requests', feature: true, js: true do ...@@ -8,7 +8,7 @@ feature 'Project settings > Merge Requests', feature: true, js: true do
background do background do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'when Merge Request and Pipelines are initially enabled' do context 'when Merge Request and Pipelines are initially enabled' do
......
...@@ -8,7 +8,7 @@ feature "Pipelines settings", feature: true do ...@@ -8,7 +8,7 @@ feature "Pipelines settings", feature: true do
let(:role) { :developer } let(:role) { :developer }
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, role] project.team << [user, role]
visit namespace_project_pipelines_settings_path(project.namespace, project) visit namespace_project_pipelines_settings_path(project.namespace, project)
end end
......
...@@ -7,7 +7,7 @@ feature 'Repository settings', feature: true do ...@@ -7,7 +7,7 @@ feature 'Repository settings', feature: true do
background do background do
project.team << [user, role] project.team << [user, role]
gitlab_sign_in(user) sign_in(user)
end end
context 'for developer' do context 'for developer' do
......
...@@ -6,7 +6,7 @@ feature 'Visibility settings', feature: true, js: true do ...@@ -6,7 +6,7 @@ feature 'Visibility settings', feature: true, js: true do
context 'as owner' do context 'as owner' do
before do before do
gitlab_sign_in(user) sign_in(user)
visit edit_namespace_project_path(project.namespace, project) visit edit_namespace_project_path(project.namespace, project)
end end
...@@ -32,7 +32,7 @@ feature 'Visibility settings', feature: true, js: true do ...@@ -32,7 +32,7 @@ feature 'Visibility settings', feature: true, js: true do
before do before do
project.team << [master_user, :master] project.team << [master_user, :master]
gitlab_sign_in(master_user) sign_in(master_user)
visit edit_namespace_project_path(project.namespace, project) visit edit_namespace_project_path(project.namespace, project)
end end
......
...@@ -7,7 +7,7 @@ feature 'Project shortcuts', feature: true do ...@@ -7,7 +7,7 @@ feature 'Project shortcuts', feature: true do
describe 'On a project', js: true do describe 'On a project', js: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -17,7 +17,7 @@ feature 'Create Snippet', :js, feature: true do ...@@ -17,7 +17,7 @@ feature 'Create Snippet', :js, feature: true do
context 'when a user is authenticated' do context 'when a user is authenticated' do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_snippets_path(project.namespace, project) visit namespace_project_snippets_path(project.namespace, project)
......
...@@ -7,7 +7,7 @@ feature 'Project snippet', :js, feature: true do ...@@ -7,7 +7,7 @@ feature 'Project snippet', :js, feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'Ruby file' do context 'Ruby file' do
......
...@@ -29,7 +29,7 @@ describe 'Project snippets', :js, feature: true do ...@@ -29,7 +29,7 @@ describe 'Project snippets', :js, feature: true do
context 'when submitting a note' do context 'when submitting a note' do
before do before do
gitlab_sign_in :admin sign_in(create(:admin))
visit namespace_project_snippet_path(project.namespace, project, snippets[0]) visit namespace_project_snippet_path(project.namespace, project, snippets[0])
end end
......
...@@ -8,7 +8,7 @@ describe 'Subgroup Issuables', :feature, :js, :nested_groups do ...@@ -8,7 +8,7 @@ describe 'Subgroup Issuables', :feature, :js, :nested_groups do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in user sign_in user
end end
it 'shows the full subgroup title when issues index page is empty' do it 'shows the full subgroup title when issues index page is empty' do
......
...@@ -23,7 +23,7 @@ feature 'Download buttons in tags page', feature: true do ...@@ -23,7 +23,7 @@ feature 'Download buttons in tags page', feature: true do
end end
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, role] project.team << [user, role]
end end
......
require 'spec_helper' require 'spec_helper'
feature 'Project Tree RSS' do feature 'Project Tree RSS' do
let(:user) { create(:user) }
let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
let(:path) { namespace_project_tree_path(project.namespace, project, :master) } let(:path) { namespace_project_tree_path(project.namespace, project, :master) }
context 'when signed in' do context 'when signed in' do
before do before do
user = create(:user)
project.team << [user, :developer] project.team << [user, :developer]
gitlab_sign_in(user) sign_in(user)
visit path visit path
end end
......
...@@ -6,7 +6,7 @@ feature 'New directory creation', feature: true, js: true do ...@@ -6,7 +6,7 @@ feature 'New directory creation', feature: true, js: true do
given(:project) { create(:project) } given(:project) { create(:project) }
background do background do
gitlab_sign_in(user) sign_in(user)
project.team << [user, role] project.team << [user, role]
visit namespace_project_tree_path(project.namespace, project, 'master') visit namespace_project_tree_path(project.namespace, project, 'master')
open_new_directory_modal open_new_directory_modal
......
...@@ -50,7 +50,7 @@ describe 'View on environment', js: true do ...@@ -50,7 +50,7 @@ describe 'View on environment', js: true do
let(:merge_request) { create(:merge_request, :simple, source_project: project, source_branch: branch_name) } let(:merge_request) { create(:merge_request, :simple, source_project: project, source_branch: branch_name) }
before do before do
gitlab_sign_in(user) sign_in(user)
visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request) visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
...@@ -66,7 +66,7 @@ describe 'View on environment', js: true do ...@@ -66,7 +66,7 @@ describe 'View on environment', js: true do
context 'when visiting a comparison for the branch' do context 'when visiting a comparison for the branch' do
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_compare_path(project.namespace, project, from: 'master', to: branch_name) visit namespace_project_compare_path(project.namespace, project, from: 'master', to: branch_name)
...@@ -80,7 +80,7 @@ describe 'View on environment', js: true do ...@@ -80,7 +80,7 @@ describe 'View on environment', js: true do
context 'when visiting a comparison for the commit' do context 'when visiting a comparison for the commit' do
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_compare_path(project.namespace, project, from: 'master', to: sha) visit namespace_project_compare_path(project.namespace, project, from: 'master', to: sha)
...@@ -94,7 +94,7 @@ describe 'View on environment', js: true do ...@@ -94,7 +94,7 @@ describe 'View on environment', js: true do
context 'when visiting a blob on the branch' do context 'when visiting a blob on the branch' do
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_blob_path(project.namespace, project, File.join(branch_name, file_path)) visit namespace_project_blob_path(project.namespace, project, File.join(branch_name, file_path))
...@@ -108,7 +108,7 @@ describe 'View on environment', js: true do ...@@ -108,7 +108,7 @@ describe 'View on environment', js: true do
context 'when visiting a blob on the commit' do context 'when visiting a blob on the commit' do
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_blob_path(project.namespace, project, File.join(sha, file_path)) visit namespace_project_blob_path(project.namespace, project, File.join(sha, file_path))
...@@ -122,7 +122,7 @@ describe 'View on environment', js: true do ...@@ -122,7 +122,7 @@ describe 'View on environment', js: true do
context 'when visiting the commit' do context 'when visiting the commit' do
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_commit_path(project.namespace, project, sha) visit namespace_project_commit_path(project.namespace, project, sha)
......
...@@ -16,7 +16,7 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t ...@@ -16,7 +16,7 @@ feature 'Projects > Wiki > User previews markdown changes', feature: true, js: t
project.team << [user, :master] project.team << [user, :master]
WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
gitlab_sign_in(user) sign_in(user)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
find('.shortcuts-wiki').trigger('click') find('.shortcuts-wiki').trigger('click')
......
...@@ -8,7 +8,7 @@ feature 'Wiki shortcuts', :feature, :js do ...@@ -8,7 +8,7 @@ feature 'Wiki shortcuts', :feature, :js do
end end
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_wiki_path(project.namespace, project, wiki_page) visit namespace_project_wiki_path(project.namespace, project, wiki_page)
end end
......
...@@ -5,7 +5,7 @@ feature 'Projects > Wiki > User creates wiki page', js: true, feature: true do ...@@ -5,7 +5,7 @@ feature 'Projects > Wiki > User creates wiki page', js: true, feature: true do
background do background do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
find('.shortcuts-wiki').trigger('click') find('.shortcuts-wiki').trigger('click')
......
...@@ -13,7 +13,7 @@ describe 'Projects > Wiki > User views Git access wiki page', :feature do ...@@ -13,7 +13,7 @@ describe 'Projects > Wiki > User views Git access wiki page', :feature do
end end
before do before do
gitlab_sign_in(user) sign_in(user)
end end
scenario 'Visit Wiki Page Current Commit' do scenario 'Visit Wiki Page Current Commit' do
......
...@@ -6,7 +6,7 @@ feature 'Projects > Wiki > User updates wiki page', feature: true do ...@@ -6,7 +6,7 @@ feature 'Projects > Wiki > User updates wiki page', feature: true do
background do background do
project.team << [user, :master] project.team << [user, :master]
WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute WikiPages::CreateService.new(project, user, title: 'home', content: 'Home page').execute
gitlab_sign_in(user) sign_in(user)
visit namespace_project_wikis_path(project.namespace, project) visit namespace_project_wikis_path(project.namespace, project)
end end
......
...@@ -15,7 +15,7 @@ feature 'Projects > Wiki > User views the wiki page', feature: true do ...@@ -15,7 +15,7 @@ feature 'Projects > Wiki > User views the wiki page', feature: true do
background do background do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
WikiPages::UpdateService.new( WikiPages::UpdateService.new(
project, project,
user, user,
......
...@@ -5,7 +5,7 @@ describe 'Projects > Wiki > User views wiki in project page', feature: true do ...@@ -5,7 +5,7 @@ describe 'Projects > Wiki > User views wiki in project page', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'when repository is disabled for project' do context 'when repository is disabled for project' do
......
...@@ -6,7 +6,7 @@ feature 'Project', feature: true do ...@@ -6,7 +6,7 @@ feature 'Project', feature: true do
let(:path) { namespace_project_path(project.namespace, project) } let(:path) { namespace_project_path(project.namespace, project) }
before do before do
gitlab_sign_in(:admin) sign_in(create(:admin))
end end
it 'parses Markdown' do it 'parses Markdown' do
...@@ -39,7 +39,7 @@ feature 'Project', feature: true do ...@@ -39,7 +39,7 @@ feature 'Project', feature: true do
let(:project) { create(:empty_project, namespace: user.namespace) } let(:project) { create(:empty_project, namespace: user.namespace) }
before do before do
gitlab_sign_in user sign_in user
create(:forked_project_link, forked_to_project: project) create(:forked_project_link, forked_to_project: project)
visit edit_namespace_project_path(project.namespace, project) visit edit_namespace_project_path(project.namespace, project)
end end
...@@ -60,7 +60,7 @@ feature 'Project', feature: true do ...@@ -60,7 +60,7 @@ feature 'Project', feature: true do
let(:project) { create(:empty_project, namespace: user.namespace, name: 'project1') } let(:project) { create(:empty_project, namespace: user.namespace, name: 'project1') }
before do before do
gitlab_sign_in(user) sign_in(user)
project.team << [user, :master] project.team << [user, :master]
visit edit_namespace_project_path(project.namespace, project) visit edit_namespace_project_path(project.namespace, project)
end end
...@@ -79,7 +79,7 @@ feature 'Project', feature: true do ...@@ -79,7 +79,7 @@ feature 'Project', feature: true do
let(:project) { create(:empty_project, namespace: user.namespace) } let(:project) { create(:empty_project, namespace: user.namespace) }
before do before do
gitlab_sign_in(user) sign_in(user)
project.add_user(user, Gitlab::Access::MASTER) project.add_user(user, Gitlab::Access::MASTER)
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
...@@ -98,7 +98,7 @@ feature 'Project', feature: true do ...@@ -98,7 +98,7 @@ feature 'Project', feature: true do
context 'on issues page', js: true do context 'on issues page', js: true do
before do before do
gitlab_sign_in(user) sign_in(user)
project.add_user(user, Gitlab::Access::MASTER) project.add_user(user, Gitlab::Access::MASTER)
project2.add_user(user, Gitlab::Access::MASTER) project2.add_user(user, Gitlab::Access::MASTER)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
...@@ -123,7 +123,7 @@ feature 'Project', feature: true do ...@@ -123,7 +123,7 @@ feature 'Project', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in user sign_in user
visit namespace_project_path(project.namespace, project) visit namespace_project_path(project.namespace, project)
end end
......
...@@ -5,7 +5,7 @@ feature 'Protected Branches', feature: true, js: true do ...@@ -5,7 +5,7 @@ feature 'Protected Branches', feature: true, js: true do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
def set_protected_branch_name(branch_name) def set_protected_branch_name(branch_name)
......
...@@ -5,7 +5,7 @@ feature 'Projected Tags', feature: true, js: true do ...@@ -5,7 +5,7 @@ feature 'Projected Tags', feature: true, js: true do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
def set_protected_tag_name(tag_name) def set_protected_tag_name(tag_name)
......
...@@ -8,7 +8,7 @@ describe 'Reportable note on commit', :feature, :js do ...@@ -8,7 +8,7 @@ describe 'Reportable note on commit', :feature, :js do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
end end
context 'a normal note' do context 'a normal note' do
......
...@@ -8,7 +8,7 @@ describe 'Reportable note on issue', :feature, :js do ...@@ -8,7 +8,7 @@ describe 'Reportable note on issue', :feature, :js do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
......
...@@ -7,7 +7,7 @@ describe 'Reportable note on merge request', :feature, :js do ...@@ -7,7 +7,7 @@ describe 'Reportable note on merge request', :feature, :js do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
visit namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
......
...@@ -6,7 +6,7 @@ describe 'Reportable note on snippets', :feature, :js do ...@@ -6,7 +6,7 @@ describe 'Reportable note on snippets', :feature, :js do
before do before do
project.add_master(user) project.add_master(user)
gitlab_sign_in(user) sign_in(user)
end end
describe 'on project snippet' do describe 'on project snippet' do
......
...@@ -6,7 +6,7 @@ describe "Runners" do ...@@ -6,7 +6,7 @@ describe "Runners" do
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
gitlab_sign_in(user) sign_in(user)
end end
describe "specific runners" do describe "specific runners" do
......
...@@ -9,7 +9,7 @@ describe "Search", feature: true do ...@@ -9,7 +9,7 @@ describe "Search", feature: true do
let!(:issue2) { create(:issue, project: project, author: user) } let!(:issue2) { create(:issue, project: project, author: user) }
before do before do
gitlab_sign_in(user) sign_in(user)
project.team << [user, :reporter] project.team << [user, :reporter]
visit search_path visit search_path
end end
......
...@@ -4,7 +4,7 @@ feature 'Create Snippet', :js, feature: true do ...@@ -4,7 +4,7 @@ feature 'Create Snippet', :js, feature: true do
include DropzoneHelper include DropzoneHelper
before do before do
gitlab_sign_in :user sign_in(create(:user))
visit new_snippet_path visit new_snippet_path
end end
......
...@@ -10,7 +10,7 @@ feature 'Edit Snippet', :js, feature: true do ...@@ -10,7 +10,7 @@ feature 'Edit Snippet', :js, feature: true do
let(:snippet) { create(:personal_snippet, :public, file_name: file_name, content: content, author: user) } let(:snippet) { create(:personal_snippet, :public, file_name: file_name, content: content, author: user) }
before do before do
gitlab_sign_in(user) sign_in(user)
visit edit_snippet_path(snippet) visit edit_snippet_path(snippet)
wait_for_requests wait_for_requests
......
...@@ -6,7 +6,7 @@ feature 'Explore Snippets', feature: true do ...@@ -6,7 +6,7 @@ feature 'Explore Snippets', feature: true do
let!(:private_snippet) { create(:personal_snippet, :private) } let!(:private_snippet) { create(:personal_snippet, :private) }
scenario 'User should see snippets that are not private' do scenario 'User should see snippets that are not private' do
gitlab_sign_in create(:user) sign_in create(:user)
visit explore_snippets_path visit explore_snippets_path
expect(page).to have_content(public_snippet.title) expect(page).to have_content(public_snippet.title)
...@@ -15,7 +15,7 @@ feature 'Explore Snippets', feature: true do ...@@ -15,7 +15,7 @@ feature 'Explore Snippets', feature: true do
end end
scenario 'External user should see only public snippets' do scenario 'External user should see only public snippets' do
gitlab_sign_in create(:user, :external) sign_in create(:user, :external)
visit explore_snippets_path visit explore_snippets_path
expect(page).to have_content(public_snippet.title) expect(page).to have_content(public_snippet.title)
......
...@@ -5,7 +5,7 @@ feature 'Internal Snippets', feature: true, js: true do ...@@ -5,7 +5,7 @@ feature 'Internal Snippets', feature: true, js: true do
describe 'normal user' do describe 'normal user' do
before do before do
gitlab_sign_in :user sign_in(create(:user))
end end
scenario 'sees internal snippets' do scenario 'sees internal snippets' do
......
...@@ -14,7 +14,7 @@ describe 'Comments on personal snippets', :js, feature: true do ...@@ -14,7 +14,7 @@ describe 'Comments on personal snippets', :js, feature: true do
let!(:other_note) { create(:note_on_personal_snippet) } let!(:other_note) { create(:note_on_personal_snippet) }
before do before do
gitlab_sign_in user sign_in user
visit snippet_path(snippet) visit snippet_path(snippet)
end end
......
...@@ -5,7 +5,7 @@ feature 'Search Snippets', feature: true do ...@@ -5,7 +5,7 @@ feature 'Search Snippets', feature: true do
public_snippet = create(:personal_snippet, :public, title: 'Beginning and Middle') public_snippet = create(:personal_snippet, :public, title: 'Beginning and Middle')
private_snippet = create(:personal_snippet, :private, title: 'Middle and End') private_snippet = create(:personal_snippet, :private, title: 'Middle and End')
gitlab_sign_in private_snippet.author sign_in private_snippet.author
visit dashboard_snippets_path visit dashboard_snippets_path
page.within '.search' do page.within '.search' do
...@@ -41,7 +41,7 @@ feature 'Search Snippets', feature: true do ...@@ -41,7 +41,7 @@ feature 'Search Snippets', feature: true do
CONTENT CONTENT
) )
gitlab_sign_in create(:user) sign_in create(:user)
visit dashboard_snippets_path visit dashboard_snippets_path
page.within '.search' do page.within '.search' do
......
...@@ -7,7 +7,7 @@ feature 'User Snippets', feature: true do ...@@ -7,7 +7,7 @@ feature 'User Snippets', feature: true do
let!(:private_snippet) { create(:personal_snippet, :private, author: author, title: "This is a private snippet") } let!(:private_snippet) { create(:personal_snippet, :private, author: author, title: "This is a private snippet") }
background do background do
gitlab_sign_in author sign_in author
visit dashboard_snippets_path visit dashboard_snippets_path
end end
......
...@@ -6,7 +6,7 @@ feature 'Master creates tag', feature: true do ...@@ -6,7 +6,7 @@ feature 'Master creates tag', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'from tag list' do context 'from tag list' do
......
...@@ -6,7 +6,7 @@ feature 'Master deletes tag', feature: true do ...@@ -6,7 +6,7 @@ feature 'Master deletes tag', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_tags_path(project.namespace, project) visit namespace_project_tags_path(project.namespace, project)
end end
......
...@@ -6,7 +6,7 @@ feature 'Master updates tag', feature: true do ...@@ -6,7 +6,7 @@ feature 'Master updates tag', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
visit namespace_project_tags_path(project.namespace, project) visit namespace_project_tags_path(project.namespace, project)
end end
......
...@@ -5,7 +5,7 @@ feature 'Master views tags', feature: true do ...@@ -5,7 +5,7 @@ feature 'Master views tags', feature: true do
before do before do
project.team << [user, :master] project.team << [user, :master]
gitlab_sign_in(user) sign_in(user)
end end
context 'when project has no tags' do context 'when project has no tags' do
......
...@@ -5,7 +5,7 @@ feature 'User uploads avatar to group', feature: true do ...@@ -5,7 +5,7 @@ feature 'User uploads avatar to group', feature: true do
user = create(:user) user = create(:user)
group = create(:group) group = create(:group)
group.add_owner(user) group.add_owner(user)
gitlab_sign_in(user) sign_in(user)
visit edit_group_path(group) visit edit_group_path(group)
attach_file( attach_file(
......
...@@ -3,7 +3,7 @@ require 'rails_helper' ...@@ -3,7 +3,7 @@ require 'rails_helper'
feature 'User uploads avatar to profile', feature: true do feature 'User uploads avatar to profile', feature: true do
scenario 'they see their new avatar' do scenario 'they see their new avatar' do
user = create(:user) user = create(:user)
gitlab_sign_in(user) sign_in(user)
visit profile_path visit profile_path
attach_file( attach_file(
......
...@@ -8,7 +8,7 @@ feature 'User uploads file to note', feature: true do ...@@ -8,7 +8,7 @@ feature 'User uploads file to note', feature: true do
let(:issue) { create(:issue, project: project, author: user) } let(:issue) { create(:issue, project: project, author: user) }
before do before do
gitlab_sign_in(user) sign_in(user)
visit namespace_project_issue_path(project.namespace, project, issue) visit namespace_project_issue_path(project.namespace, project, issue)
end end
......
...@@ -6,7 +6,7 @@ describe 'User Callouts', js: true do ...@@ -6,7 +6,7 @@ describe 'User Callouts', js: true do
let(:project) { create(:empty_project, path: 'gitlab', name: 'sample') } let(:project) { create(:empty_project, path: 'gitlab', name: 'sample') }
before do before do
gitlab_sign_in(user) sign_in(user)
project.team << [user, :master] project.team << [user, :master]
end end
......
...@@ -57,7 +57,7 @@ describe 'User can display performacne bar', :js do ...@@ -57,7 +57,7 @@ describe 'User can display performacne bar', :js do
context 'when user is logged-in' do context 'when user is logged-in' do
before do before do
gitlab_sign_in(create(:user)) sign_in(create(:user))
visit root_path visit root_path
end end
......
...@@ -8,7 +8,7 @@ describe 'Projects tab on a user profile', :feature, :js do ...@@ -8,7 +8,7 @@ describe 'Projects tab on a user profile', :feature, :js do
before do before do
allow(Project).to receive(:default_per_page).and_return(1) allow(Project).to receive(:default_per_page).and_return(1)
gitlab_sign_in(user) sign_in(user)
visit user_path(user) visit user_path(user)
......
require 'spec_helper' require 'spec_helper'
feature 'User RSS' do feature 'User RSS' do
let(:user) { create(:user) }
let(:path) { user_path(create(:user)) } let(:path) { user_path(create(:user)) }
context 'when signed in' do context 'when signed in' do
before do before do
gitlab_sign_in(create(:user)) sign_in(user)
visit path visit path
end end
......
...@@ -24,7 +24,7 @@ describe 'Snippets tab on a user profile', feature: true, js: true do ...@@ -24,7 +24,7 @@ describe 'Snippets tab on a user profile', feature: true, js: true do
let!(:other_snippet) { create(:snippet, :public) } let!(:other_snippet) { create(:snippet, :public) }
it 'contains only internal and public snippets of a user when a user is logged in' do it 'contains only internal and public snippets of a user when a user is logged in' do
gitlab_sign_in(:user) sign_in(create(:user))
visit user_path(user) visit user_path(user)
page.within('.user-profile-nav') { click_link 'Snippets' } page.within('.user-profile-nav') { click_link 'Snippets' }
wait_for_requests wait_for_requests
......
...@@ -6,7 +6,7 @@ describe 'Project variables', js: true do ...@@ -6,7 +6,7 @@ describe 'Project variables', js: true do
let(:variable) { create(:ci_variable, key: 'test_key', value: 'test value') } let(:variable) { create(:ci_variable, key: 'test_key', value: 'test value') }
before do before do
gitlab_sign_in(user) sign_in(user)
project.team << [user, :master] project.team << [user, :master]
project.variables << variable project.variables << variable
......
...@@ -17,7 +17,8 @@ shared_examples 'issuable record that supports quick actions in its description ...@@ -17,7 +17,8 @@ shared_examples 'issuable record that supports quick actions in its description
project.team << [master, :master] project.team << [master, :master]
project.team << [assignee, :developer] project.team << [assignee, :developer]
project.team << [guest, :guest] project.team << [guest, :guest]
gitlab_sign_in(master)
sign_in(master)
end end
after do after do
...@@ -111,7 +112,7 @@ shared_examples 'issuable record that supports quick actions in its description ...@@ -111,7 +112,7 @@ shared_examples 'issuable record that supports quick actions in its description
context "when current user cannot close #{issuable_type}" do context "when current user cannot close #{issuable_type}" do
before do before do
gitlab_sign_out gitlab_sign_out
gitlab_sign_in(guest) sign_in(guest)
visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable) visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable)
end end
...@@ -146,7 +147,7 @@ shared_examples 'issuable record that supports quick actions in its description ...@@ -146,7 +147,7 @@ shared_examples 'issuable record that supports quick actions in its description
context "when current user cannot reopen #{issuable_type}" do context "when current user cannot reopen #{issuable_type}" do
before do before do
gitlab_sign_out gitlab_sign_out
gitlab_sign_in(guest) sign_in(guest)
visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable) visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable)
end end
...@@ -176,7 +177,7 @@ shared_examples 'issuable record that supports quick actions in its description ...@@ -176,7 +177,7 @@ shared_examples 'issuable record that supports quick actions in its description
context "when current user cannot change title of #{issuable_type}" do context "when current user cannot change title of #{issuable_type}" do
before do before do
gitlab_sign_out gitlab_sign_out
gitlab_sign_in(guest) sign_in(guest)
visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable) visit public_send("namespace_project_#{issuable_type}_path", project.namespace, project, issuable)
end end
......
shared_examples "an autodiscoverable RSS feed with current_user's RSS token" do shared_examples "an autodiscoverable RSS feed with current_user's RSS token" do
it "has an RSS autodiscovery link tag with current_user's RSS token" do it "has an RSS autodiscovery link tag with current_user's RSS token" do
expect(page).to have_css("link[type*='atom+xml'][href*='rss_token=#{Thread.current[:current_user].rss_token}']", visible: false) expect(page).to have_css("link[type*='atom+xml'][href*='rss_token=#{user.rss_token}']", visible: false)
end end
end end
shared_examples "it has an RSS button with current_user's RSS token" do shared_examples "it has an RSS button with current_user's RSS token" do
it "shows the RSS button with current_user's RSS token" do it "shows the RSS button with current_user's RSS token" do
expect(page).to have_css("a:has(.fa-rss)[href*='rss_token=#{Thread.current[:current_user].rss_token}']") expect(page).to have_css("a:has(.fa-rss)[href*='rss_token=#{user.rss_token}']")
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment