diff options
Diffstat (limited to 'spec/features/users')
-rw-r--r-- | spec/features/users/active_sessions_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/add_email_to_existing_account_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/anonymous_sessions_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/login_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/logout_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/overview_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/rss_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/show_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/signup_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/users/snippets_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/terms_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/users/user_browses_projects_on_user_page_spec.rb | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/spec/features/users/active_sessions_spec.rb b/spec/features/users/active_sessions_spec.rb index c717e89eafb..8e2e16e555e 100644 --- a/spec/features/users/active_sessions_spec.rb +++ b/spec/features/users/active_sessions_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Active user sessions', :clean_gitlab_redis_shared_state do +RSpec.describe 'Active user sessions', :clean_gitlab_redis_shared_state do it 'Successful login adds a new active user login' do now = Time.zone.parse('2018-03-12 09:06') Timecop.freeze(now) do diff --git a/spec/features/users/add_email_to_existing_account_spec.rb b/spec/features/users/add_email_to_existing_account_spec.rb index 42e352399a8..9130b96b0e3 100644 --- a/spec/features/users/add_email_to_existing_account_spec.rb +++ b/spec/features/users/add_email_to_existing_account_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'AdditionalEmailToExistingAccount' do +RSpec.describe 'AdditionalEmailToExistingAccount' do describe 'add secondary email associated with account' do let(:user) { create(:user) } diff --git a/spec/features/users/anonymous_sessions_spec.rb b/spec/features/users/anonymous_sessions_spec.rb index e87ee39a3f4..420fb225f94 100644 --- a/spec/features/users/anonymous_sessions_spec.rb +++ b/spec/features/users/anonymous_sessions_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Session TTLs', :clean_gitlab_redis_shared_state do +RSpec.describe 'Session TTLs', :clean_gitlab_redis_shared_state do it 'creates a session with a short TTL when login fails' do visit new_user_session_path # The session key only gets created after a post diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb index 5a8db3c070d..7ba663d08d4 100644 --- a/spec/features/users/login_spec.rb +++ b/spec/features/users/login_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Login' do +RSpec.describe 'Login' do include TermsHelper include UserLoginHelper diff --git a/spec/features/users/logout_spec.rb b/spec/features/users/logout_spec.rb index a72a42c738d..ffb8785b277 100644 --- a/spec/features/users/logout_spec.rb +++ b/spec/features/users/logout_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Logout/Sign out', :js do +RSpec.describe 'Logout/Sign out', :js do let(:user) { create(:user) } before do diff --git a/spec/features/users/overview_spec.rb b/spec/features/users/overview_spec.rb index b3531d040e4..549087e5950 100644 --- a/spec/features/users/overview_spec.rb +++ b/spec/features/users/overview_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Overview tab on a user profile', :js do +RSpec.describe 'Overview tab on a user profile', :js do let(:user) { create(:user) } let(:contributed_project) { create(:project, :public, :repository) } diff --git a/spec/features/users/rss_spec.rb b/spec/features/users/rss_spec.rb index ecdbf032623..aba1ff63fab 100644 --- a/spec/features/users/rss_spec.rb +++ b/spec/features/users/rss_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'User RSS' do +RSpec.describe 'User RSS' do let(:user) { create(:user) } let(:path) { user_path(create(:user)) } diff --git a/spec/features/users/show_spec.rb b/spec/features/users/show_spec.rb index a45389a7ed5..dd5c2442d00 100644 --- a/spec/features/users/show_spec.rb +++ b/spec/features/users/show_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'User page' do +RSpec.describe 'User page' do include ExternalAuthorizationServiceHelpers let(:user) { create(:user) } diff --git a/spec/features/users/signup_spec.rb b/spec/features/users/signup_spec.rb index 0ef86dde030..66a26493339 100644 --- a/spec/features/users/signup_spec.rb +++ b/spec/features/users/signup_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -shared_examples 'Signup' do +RSpec.shared_examples 'Signup' do include TermsHelper let(:new_user) { build_stubbed(:user) } @@ -420,7 +420,7 @@ shared_examples 'Signup' do end end -shared_examples 'Signup name validation' do |field, max_length| +RSpec.shared_examples 'Signup name validation' do |field, max_length| before do visit new_user_registration_path end @@ -458,7 +458,7 @@ shared_examples 'Signup name validation' do |field, max_length| end end -describe 'With original flow' do +RSpec.describe 'With original flow' do before do stub_experiment(signup_flow: false) stub_experiment_for_user(signup_flow: false) @@ -468,7 +468,7 @@ describe 'With original flow' do it_behaves_like 'Signup name validation', 'new_user_name', 255 end -describe 'With experimental flow' do +RSpec.describe 'With experimental flow' do before do stub_experiment(signup_flow: true) stub_experiment_for_user(signup_flow: true) diff --git a/spec/features/users/snippets_spec.rb b/spec/features/users/snippets_spec.rb index 8b6bf54b642..ce19e491a7c 100644 --- a/spec/features/users/snippets_spec.rb +++ b/spec/features/users/snippets_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Snippets tab on a user profile', :js do +RSpec.describe 'Snippets tab on a user profile', :js do context 'when the user has snippets' do let(:user) { create(:user) } diff --git a/spec/features/users/terms_spec.rb b/spec/features/users/terms_spec.rb index ec2210faa80..5275845fe5b 100644 --- a/spec/features/users/terms_spec.rb +++ b/spec/features/users/terms_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Users > Terms' do +RSpec.describe 'Users > Terms' do include TermsHelper let!(:term) { create(:term, terms: 'By accepting, you promise to be nice!') } diff --git a/spec/features/users/user_browses_projects_on_user_page_spec.rb b/spec/features/users/user_browses_projects_on_user_page_spec.rb index 9a1ee7715d6..7d05b2ae27a 100644 --- a/spec/features/users/user_browses_projects_on_user_page_spec.rb +++ b/spec/features/users/user_browses_projects_on_user_page_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Users > User browses projects on user page', :js do +RSpec.describe 'Users > User browses projects on user page', :js do let!(:user) { create :user } let!(:private_project) do create :project, :private, name: 'private', namespace: user.namespace do |project| |