Skip to content
Snippets Groups Projects
Commit dc69c5d9 authored by Lukas Eipert's avatar Lukas Eipert
Browse files

Add no_super_sidebar trait to CE specs

We are adding the no_super_sidebar trait to CE specs that rely on the
old-nav behavior.
See:
  - !130148
  - !126175
parent 305827ad
No related branches found
No related tags found
1 merge request!130301Add no_super_sidebar trait to CE specs (1/2)
This commit is part of merge request !130301. Comments created here will be created in the context of that merge request.
Showing
with 29 additions and 30 deletions
......@@ -3,9 +3,9 @@
require 'spec_helper'
RSpec.describe 'Abuse reports', :js, feature_category: :insider_threat do
let_it_be(:abusive_user) { create(:user) }
let_it_be(:abusive_user) { create(:user, :no_super_sidebar) }
let_it_be(:reporter1) { create(:user) }
let_it_be(:reporter1) { create(:user, :no_super_sidebar) }
let_it_be(:project) { create(:project, :public, :repository) }
let_it_be(:issue) { create(:issue, project: project, author: abusive_user) }
......@@ -57,7 +57,7 @@
describe 'when user_profile_overflow_menu FF turned on' do
context 'when reporting a user profile for abuse' do
let_it_be(:reporter2) { create(:user) }
let_it_be(:reporter2) { create(:user, :no_super_sidebar) }
before do
visit user_path(abusive_user)
......@@ -108,7 +108,7 @@
describe 'when user_profile_overflow_menu FF turned off' do
context 'when reporting a user profile for abuse' do
let_it_be(:reporter2) { create(:user) }
let_it_be(:reporter2) { create(:user, :no_super_sidebar) }
before do
stub_feature_flags(user_profile_overflow_menu_vue: false)
......
......@@ -5,7 +5,7 @@
RSpec.describe 'Admin::Hooks', feature_category: :webhooks do
include Spec::Support::Helpers::ModalHelpers
let_it_be(:user) { create(:admin) }
let_it_be(:user) { create(:admin, :no_super_sidebar) }
before do
sign_in(user)
......
......@@ -7,7 +7,7 @@
include UserLoginHelper
include Features::TopNavSpecHelpers
let(:user) { create(:admin) }
let(:user) { create(:admin, :no_super_sidebar) }
before do
# TODO: This used to use gitlab_sign_in, instead of sign_in, but that is buggy. See
......
......@@ -6,8 +6,8 @@
RSpec.describe 'Admin mode for workers', :request_store, feature_category: :system_access do
include Features::AdminUsersHelpers
let(:user) { create(:user) }
let(:user_to_delete) { create(:user) }
let(:user) { create(:user, :no_super_sidebar) }
let(:user_to_delete) { create(:user, :no_super_sidebar) }
before do
sign_in(user)
......@@ -22,7 +22,7 @@
end
context 'as an admin user' do
let(:user) { create(:admin) }
let(:user) { create(:admin, :no_super_sidebar) }
context 'when admin mode disabled' do
it 'cannot delete user', :js do
......
......@@ -7,7 +7,7 @@
include Features::TopNavSpecHelpers
include StubENV
let(:admin) { create(:admin) }
let(:admin) { create(:admin, :no_super_sidebar) }
before do
stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
......
......@@ -5,7 +5,7 @@
RSpec.describe "Admin > Admin sees background migrations", feature_category: :database do
include ListboxHelpers
let_it_be(:admin) { create(:admin) }
let_it_be(:admin) { create(:admin, :no_super_sidebar) }
let(:job_class) { Gitlab::BackgroundMigration::CopyColumnUsingBackgroundMigrationJob }
let_it_be(:active_migration) { create(:batched_background_migration, :active, table_name: 'active') }
......
......@@ -7,7 +7,7 @@
include TermsHelper
include UsageDataHelpers
let_it_be(:admin) { create(:admin) }
let_it_be(:admin) { create(:admin, :no_super_sidebar) }
context 'application setting :admin_mode is enabled', :request_store do
before do
......
......@@ -6,8 +6,8 @@
include Features::AdminUsersHelpers
include Spec::Support::Helpers::ModalHelpers
let_it_be(:user) { create(:omniauth_user, provider: 'twitter', extern_uid: '123456') }
let_it_be(:current_user) { create(:admin) }
let_it_be(:user) { create(:omniauth_user, :no_super_sidebar, provider: 'twitter', extern_uid: '123456') }
let_it_be(:current_user) { create(:admin, :no_super_sidebar) }
before do
sign_in(current_user)
......@@ -145,7 +145,7 @@
end
describe 'Impersonation' do
let_it_be(:another_user) { create(:user) }
let_it_be(:another_user) { create(:user, :no_super_sidebar) }
context 'before impersonating' do
subject { visit admin_user_path(user_to_visit) }
......
......@@ -4,7 +4,7 @@
RSpec.describe 'Alert details', :js, feature_category: :incident_management do
let_it_be(:project) { create(:project) }
let_it_be(:developer) { create(:user) }
let_it_be(:developer) { create(:user, :no_super_sidebar) }
let_it_be(:alert) { create(:alert_management_alert, project: project, status: 'triggered', title: 'Alert') }
before_all do
......
......@@ -4,7 +4,7 @@
RSpec.describe 'Alert Management index', :js, feature_category: :incident_management do
let_it_be(:project) { create(:project) }
let_it_be(:developer) { create(:user) }
let_it_be(:developer) { create(:user, :no_super_sidebar) }
before_all do
project.add_developer(developer)
......
......@@ -3,7 +3,7 @@
require 'spec_helper'
RSpec.describe 'Multiple Issue Boards', :js, feature_category: :team_planning do
let_it_be(:user) { create(:user) }
let_it_be(:user) { create(:user, :no_super_sidebar) }
let_it_be(:project) { create(:project, :public) }
let_it_be(:planning) { create(:label, project: project, name: 'Planning') }
let_it_be(:board) { create(:board, name: 'board1', project: project) }
......
......@@ -5,7 +5,7 @@
RSpec.describe 'Contributions Calendar', :js, feature_category: :user_profile do
include MobileHelpers
let(:user) { create(:user) }
let(:user) { create(:user, :no_super_sidebar) }
let(:contributed_project) { create(:project, :public, :repository) }
let(:issue_note) { create(:note, project: contributed_project) }
......
......@@ -4,9 +4,8 @@
RSpec.describe 'Contextual sidebar', :js, feature_category: :remote_development do
context 'when context is a project' do
let_it_be(:project) { create(:project) }
let(:user) { project.first_owner }
let_it_be(:user) { create(:user, :no_super_sidebar) }
let_it_be(:project) { create(:project, :repository, namespace: user.namespace) }
before do
sign_in(user)
......
......@@ -3,7 +3,7 @@
require 'spec_helper'
RSpec.describe 'Dashboard > Activity', feature_category: :user_profile do
let(:user) { create(:user) }
let(:user) { create(:user, :no_super_sidebar) }
before do
sign_in(user)
......
......@@ -6,7 +6,7 @@
include ExternalAuthorizationServiceHelpers
include Features::TopNavSpecHelpers
let(:user) { create(:user) }
let(:user) { create(:user, :no_super_sidebar) }
before do
sign_in user
......
......@@ -3,7 +3,7 @@
require 'spec_helper'
RSpec.describe 'Dashboard Groups page', :js, feature_category: :groups_and_projects do
let(:user) { create :user }
let(:user) { create(:user, :no_super_sidebar) }
let(:group) { create(:group) }
let(:nested_group) { create(:group, :nested) }
let(:another_group) { create(:group) }
......
......@@ -3,7 +3,7 @@
require 'spec_helper'
RSpec.describe 'Navigation bar counter', :use_clean_rails_memory_store_caching, feature_category: :team_planning do
let(:user) { create(:user) }
let(:user) { create(:user, :no_super_sidebar) }
let(:project) { create(:project, namespace: user.namespace) }
let(:issue) { create(:issue, project: project) }
let(:merge_request) { create(:merge_request, source_project: project) }
......
......@@ -5,7 +5,7 @@
RSpec.describe 'Dashboard Issues', feature_category: :team_planning do
include FilteredSearchHelpers
let_it_be(:current_user) { create :user }
let_it_be(:current_user) { create(:user, :no_super_sidebar) }
let_it_be(:user) { current_user } # Shared examples depend on this being available
let_it_be(:public_project) { create(:project, :public) }
let_it_be(:project) { create(:project) }
......
......@@ -7,7 +7,7 @@
include FilteredSearchHelpers
include ProjectForksHelper
let(:current_user) { create :user }
let(:current_user) { create(:user, :no_super_sidebar) }
let(:user) { current_user }
let(:project) { create(:project) }
......
......@@ -14,7 +14,7 @@
end
describe 'as logged-in user' do
let(:user) { create(:user) }
let(:user) { create(:user, :no_super_sidebar) }
let(:group) { create(:group) }
let(:project) { create(:project, namespace: user.namespace) }
let!(:milestone) { create(:milestone, project: project) }
......@@ -50,7 +50,7 @@
end
describe 'with merge requests disabled' do
let(:user) { create(:user) }
let(:user) { create(:user, :no_super_sidebar) }
let(:group) { create(:group) }
let(:project) { create(:project, :merge_requests_disabled, namespace: user.namespace) }
let!(:milestone) { create(:milestone, project: project) }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment