Skip to content
Snippets Groups Projects
Verified Commit 050456d2 authored by Piotr Skorupa's avatar Piotr Skorupa Committed by GitLab
Browse files

Merge branch 'update-user-factories-usages-part-4' into 'master'

Update specs to new factories syntax part 4

See merge request !149393



Merged-by: default avatarPiotr Skorupa <pskorupa@gitlab.com>
Approved-by: default avatarMartin Čavoj <mcavoj@gitlab.com>
Approved-by: default avatarPiotr Skorupa <pskorupa@gitlab.com>
Reviewed-by: default avatarMartin Čavoj <mcavoj@gitlab.com>
Co-authored-by: Pavel Shutsin's avatarPavel Shutsin <pshutsin@gitlab.com>
parents f7bf7bf0 47b01f5b
No related branches found
No related tags found
2 merge requests!158455Backport Release Environments notification pipeline change to 16.11,!149393Update specs to new factories syntax part 4
Pipeline #1254196231 failed
Pipeline: E2E Omnibus GitLab CE

#1254278034

    Pipeline: E2E Omnibus GitLab EE

    #1254224551

      Pipeline: E2E Omnibus GitLab Nightly

      #1254224478

        +2
        Showing
        with 21 additions and 104 deletions
        ...@@ -4,14 +4,10 @@ ...@@ -4,14 +4,10 @@
        RSpec.describe "Achievements", :js, feature_category: :user_profile do RSpec.describe "Achievements", :js, feature_category: :user_profile do
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
        let_it_be(:group) { create(:group, :public) } let_it_be(:group) { create(:group, :public, maintainers: user) }
        let_it_be(:achievement1) { create(:achievement, namespace: group) } let_it_be(:achievement1) { create(:achievement, namespace: group) }
        let_it_be(:achievement2) { create(:achievement, namespace: group, description: 'Achievement description') } let_it_be(:achievement2) { create(:achievement, namespace: group, description: 'Achievement description') }
        before_all do
        group.add_maintainer(user)
        end
        before do before do
        sign_in(user) sign_in(user)
        end end
        ......
        ...@@ -5,11 +5,7 @@ ...@@ -5,11 +5,7 @@
        RSpec.describe 'ActionCable logging', :js, feature_category: :shared do RSpec.describe 'ActionCable logging', :js, feature_category: :shared do
        let_it_be(:project) { create(:project, :public) } let_it_be(:project) { create(:project, :public) }
        let_it_be(:issue) { create(:issue, project: project) } let_it_be(:issue) { create(:issue, project: project) }
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user, developer_of: project) }
        before_all do
        project.add_developer(user)
        end
        it 'adds extra context to logs' do it 'adds extra context to logs' do
        allow(ActiveSupport::Notifications).to receive(:instrument).and_call_original allow(ActiveSupport::Notifications).to receive(:instrument).and_call_original
        ......
        ...@@ -4,13 +4,9 @@ ...@@ -4,13 +4,9 @@
        RSpec.describe 'Alert details', :js, feature_category: :incident_management do RSpec.describe 'Alert details', :js, feature_category: :incident_management do
        let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
        let_it_be(:developer) { create(:user) } let_it_be(:developer) { create(:user, developer_of: project) }
        let_it_be(:alert) { create(:alert_management_alert, project: project, status: 'triggered', title: 'Alert') } let_it_be(:alert) { create(:alert_management_alert, project: project, status: 'triggered', title: 'Alert') }
        before_all do
        project.add_developer(developer)
        end
        before do before do
        sign_in(developer) sign_in(developer)
        ......
        ...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
        RSpec.describe 'Alert Management index', :js, feature_category: :incident_management do RSpec.describe 'Alert Management index', :js, feature_category: :incident_management do
        let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
        let_it_be(:developer) { create(:user) } let_it_be(:developer) { create(:user, developer_of: project) }
        before_all do
        project.add_developer(developer)
        end
        context 'when a developer displays the alert list' do context 'when a developer displays the alert list' do
        before do before do
        ......
        ...@@ -4,15 +4,11 @@ ...@@ -4,15 +4,11 @@
        RSpec.describe 'User filters Alert Management table by status', :js, feature_category: :incident_management do RSpec.describe 'User filters Alert Management table by status', :js, feature_category: :incident_management do
        let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
        let_it_be(:developer) { create(:user) } let_it_be(:developer) { create(:user, developer_of: project) }
        let_it_be(:alert1, reload: true) { create(:alert_management_alert, :triggered, project: project) } let_it_be(:alert1, reload: true) { create(:alert_management_alert, :triggered, project: project) }
        let_it_be(:alert2, reload: true) { create(:alert_management_alert, :acknowledged, project: project) } let_it_be(:alert2, reload: true) { create(:alert_management_alert, :acknowledged, project: project) }
        let_it_be(:alert3, reload: true) { create(:alert_management_alert, :acknowledged, project: project) } let_it_be(:alert3, reload: true) { create(:alert_management_alert, :acknowledged, project: project) }
        before_all do
        project.add_developer(developer)
        end
        before do before do
        sign_in(developer) sign_in(developer)
        ......
        ...@@ -4,13 +4,9 @@ ...@@ -4,13 +4,9 @@
        RSpec.describe 'User searches Alert Management alerts', :js, feature_category: :incident_management do RSpec.describe 'User searches Alert Management alerts', :js, feature_category: :incident_management do
        let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
        let_it_be(:developer) { create(:user) } let_it_be(:developer) { create(:user, developer_of: project) }
        let_it_be(:alert) { create(:alert_management_alert, project: project, status: 'triggered') } let_it_be(:alert) { create(:alert_management_alert, project: project, status: 'triggered') }
        before_all do
        project.add_developer(developer)
        end
        before do before do
        sign_in(developer) sign_in(developer)
        ......
        ...@@ -4,13 +4,9 @@ ...@@ -4,13 +4,9 @@
        RSpec.describe 'User updates Alert Management status', :js, feature_category: :incident_management do RSpec.describe 'User updates Alert Management status', :js, feature_category: :incident_management do
        let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
        let_it_be(:developer) { create(:user) } let_it_be(:developer) { create(:user, developer_of: project) }
        let_it_be(:alert) { create(:alert_management_alert, project: project, status: 'triggered') } let_it_be(:alert) { create(:alert_management_alert, project: project, status: 'triggered') }
        before_all do
        project.add_developer(developer)
        end
        before do before do
        sign_in(developer) sign_in(developer)
        ......
        ...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
        RSpec.describe 'Alert management', :js, feature_category: :incident_management do RSpec.describe 'Alert management', :js, feature_category: :incident_management do
        let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
        let_it_be(:developer) { create(:user) } let_it_be(:developer) { create(:user, developer_of: project) }
        before_all do
        project.add_developer(developer)
        end
        context 'when visiting the alert details page' do context 'when visiting the alert details page' do
        let!(:alert) { create(:alert_management_alert, :resolved, :with_fingerprint, title: 'dos-test', project: project, **options) } let!(:alert) { create(:alert_management_alert, :resolved, :with_fingerprint, title: 'dos-test', project: project, **options) }
        ......
        ...@@ -4,13 +4,8 @@ ...@@ -4,13 +4,8 @@
        RSpec.describe 'Alert integrations settings form', :js, feature_category: :incident_management do RSpec.describe 'Alert integrations settings form', :js, feature_category: :incident_management do
        let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
        let_it_be(:maintainer) { create(:user) } let_it_be(:maintainer) { create(:user, maintainer_of: project) }
        let_it_be(:developer) { create(:user) } let_it_be(:developer) { create(:user, developer_of: project) }
        before_all do
        project.add_maintainer(maintainer)
        project.add_developer(developer)
        end
        before do before do
        sign_in(maintainer) sign_in(maintainer)
        ......
        ...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
        let_it_be(:project) { create(:project, :public, namespace: group) } let_it_be(:project) { create(:project, :public, namespace: group) }
        let_it_be(:group_board) { create(:board, group: group) } let_it_be(:group_board) { create(:board, group: group) }
        let_it_be(:project_board) { create(:board, project: project) } let_it_be(:project_board) { create(:board, project: project) }
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user, maintainer_of: project, owner_of: group) }
        let_it_be(:milestone) { create(:milestone, project: project) } let_it_be(:milestone) { create(:milestone, project: project) }
        ...@@ -18,11 +18,6 @@ ...@@ -18,11 +18,6 @@
        let_it_be(:issue) { create(:labeled_issue, project: project, labels: [group_label, project_label]) } let_it_be(:issue) { create(:labeled_issue, project: project, labels: [group_label, project_label]) }
        before_all do
        project.add_maintainer(user)
        group.add_owner(user)
        end
        where(:board_type) do where(:board_type) do
        [[:project], [:group]] [[:project], [:group]]
        end end
        ......
        ...@@ -4,14 +4,10 @@ ...@@ -4,14 +4,10 @@
        RSpec.describe 'Tooltips on .timeago dates', :js, feature_category: :user_profile do RSpec.describe 'Tooltips on .timeago dates', :js, feature_category: :user_profile do
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
        let_it_be(:project) { create(:project, name: 'test', namespace: user.namespace) } let_it_be(:project) { create(:project, name: 'test', namespace: user.namespace, maintainers: user) }
        let(:created_date) { 1.day.ago.beginning_of_minute - 1.hour } let(:created_date) { 1.day.ago.beginning_of_minute - 1.hour }
        before_all do
        project.add_maintainer(user)
        end
        before do before do
        stub_feature_flags(profile_tabs_vue: false) stub_feature_flags(profile_tabs_vue: false)
        end end
        ......
        ...@@ -5,11 +5,7 @@ ...@@ -5,11 +5,7 @@
        RSpec.describe 'Dashboard > Todo target states', feature_category: :team_planning do RSpec.describe 'Dashboard > Todo target states', feature_category: :team_planning do
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
        let_it_be(:author) { create(:user) } let_it_be(:author) { create(:user) }
        let_it_be(:project) { create(:project, :public) } let_it_be(:project) { create(:project, :public, developers: user) }
        before_all do
        project.add_developer(user)
        end
        before do before do
        sign_in(user) sign_in(user)
        ......
        ...@@ -9,13 +9,9 @@ ...@@ -9,13 +9,9 @@
        let_it_be(:user2) { create(:user, username: 'diane') } let_it_be(:user2) { create(:user, username: 'diane') }
        let_it_be(:user3) { create(:user) } let_it_be(:user3) { create(:user) }
        let_it_be(:author) { create(:user) } let_it_be(:author) { create(:user) }
        let_it_be(:project) { create(:project, :public) } let_it_be(:project) { create(:project, :public, developers: user) }
        let_it_be(:issue) { create(:issue, project: project, due_date: Date.today, title: "Fix bug") } let_it_be(:issue) { create(:issue, project: project, due_date: Date.today, title: "Fix bug") }
        before_all do
        project.add_developer(user)
        end
        it_behaves_like 'a "Your work" page with sidebar and breadcrumbs', :dashboard_todos_path, :todos it_behaves_like 'a "Your work" page with sidebar and breadcrumbs', :dashboard_todos_path, :todos
        context 'User does not have todos' do context 'User does not have todos' do
        ......
        ...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
        RSpec.describe 'CI/CD Catalog releases', :js, feature_category: :pipeline_composition, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/432824' do RSpec.describe 'CI/CD Catalog releases', :js, feature_category: :pipeline_composition, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/432824' do
        let_it_be(:tag_name) { 'catalog_release_tag' } let_it_be(:tag_name) { 'catalog_release_tag' }
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
        let_it_be_with_reload(:namespace) { create(:group) } let_it_be_with_reload(:namespace) { create(:group, owners: user) }
        let_it_be_with_reload(:project) do let_it_be_with_reload(:project) do
        create( create(
        :project, :project,
        ...@@ -19,10 +19,6 @@ ...@@ -19,10 +19,6 @@
        create(:ci_catalog_resource, project: project) create(:ci_catalog_resource, project: project)
        end end
        before_all do
        namespace.add_owner(user)
        end
        before do before do
        sign_in(user) sign_in(user)
        end end
        ......
        ...@@ -8,14 +8,9 @@ ...@@ -8,14 +8,9 @@
        let_it_be(:group_owner) { create(:user) } let_it_be(:group_owner) { create(:user) }
        let_it_be(:group_maintainer) { create(:user) } let_it_be(:group_maintainer) { create(:user) }
        let_it_be(:group) { create(:group) } let_it_be(:group) { create(:group, owners: group_owner, maintainers: group_maintainer) }
        let_it_be(:project) { create(:project, group: group) } let_it_be(:project) { create(:project, group: group) }
        before_all do
        group.add_owner(group_owner)
        group.add_maintainer(group_maintainer)
        end
        describe "Group runners page", :js do describe "Group runners page", :js do
        context 'when logged in as group maintainer' do context 'when logged in as group maintainer' do
        before do before do
        ......
        ...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
        RSpec.describe 'Import/Export - Connect to another instance', :js, feature_category: :importers do RSpec.describe 'Import/Export - Connect to another instance', :js, feature_category: :importers do
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
        let_it_be(:group) { create(:group) } let_it_be(:group) { create(:group, owners: user) }
        before_all do
        group.add_owner(user)
        end
        context 'when importing group by direct transfer is enabled' do context 'when importing group by direct transfer is enabled' do
        before do before do
        ......
        ...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
        include Features::AutocompleteHelpers include Features::AutocompleteHelpers
        let_it_be(:user) { create(:user, name: '💃speciąl someone💃', username: 'someone.special') } let_it_be(:user) { create(:user, name: '💃speciąl someone💃', username: 'someone.special') }
        let_it_be(:group) { create(:group, name: 'Ancestor') } let_it_be(:group) { create(:group, name: 'Ancestor', maintainers: user) }
        let_it_be(:project) { create(:project, :repository, group: group) } let_it_be(:project) { create(:project, :repository, group: group) }
        let_it_be(:issue) { create(:issue, project: project, assignees: [user], title: 'My special issue') } let_it_be(:issue) { create(:issue, project: project, assignees: [user], title: 'My special issue') }
        let_it_be(:label) { create(:group_label, group: group, title: 'special+') } let_it_be(:label) { create(:group_label, group: group, title: 'special+') }
        ...@@ -43,10 +43,6 @@ ...@@ -43,10 +43,6 @@
        end end
        end end
        before_all do
        group.add_maintainer(user)
        end
        describe 'new milestone page' do describe 'new milestone page' do
        before do before do
        sign_in(user) sign_in(user)
        ......
        ...@@ -7,13 +7,9 @@ ...@@ -7,13 +7,9 @@
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
        let_it_be(:bot_user) { create(:user, :project_bot) } let_it_be(:bot_user) { create(:user, :project_bot) }
        let_it_be(:group) { create(:group) } let_it_be(:group) { create(:group, owners: user) }
        let_it_be(:resource_settings_access_tokens_path) { group_settings_access_tokens_path(group) } let_it_be(:resource_settings_access_tokens_path) { group_settings_access_tokens_path(group) }
        before_all do
        group.add_owner(user)
        end
        before do before do
        sign_in(user) sign_in(user)
        end end
        ......
        ...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
        include WaitForRequests include WaitForRequests
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
        let_it_be(:group, reload: true) { create(:group) } let_it_be(:group, reload: true) { create(:group, owners: user) }
        before_all do
        group.add_owner(user)
        end
        before do before do
        sign_in(user) sign_in(user)
        ......
        ...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
        include WaitForRequests include WaitForRequests
        let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
        let_it_be(:group, reload: true) { create(:group) } let_it_be(:group, reload: true) { create(:group, owners: user) }
        before_all do
        group.add_owner(user)
        end
        before do before do
        sign_in(user) sign_in(user)
        ......
        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