diff options
6 files changed, 10 insertions, 6 deletions
diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md index 4c53643ed9c..827b3d7681a 100644 --- a/doc/development/contributing/issue_workflow.md +++ b/doc/development/contributing/issue_workflow.md @@ -62,10 +62,12 @@ The current team labels are: - ~Configure - ~Create +- ~Defend - ~Distribution - ~Documentation - ~Geo - ~Gitaly +- ~Growth - ~Manage - ~Monitor - ~Plan @@ -99,6 +101,8 @@ The current stage labels are: - ~"devops:configure" - ~"devops:monitor" - ~"devops:secure" +- ~"devops:defend" +- ~"devops:enablement" These labels should be mutually exclusive. If an issue belongs to multiple stages, the most relevant should be used. diff --git a/doc/development/testing_guide/flaky_tests.md b/doc/development/testing_guide/flaky_tests.md index 3d568c37fba..931cbc51cae 100644 --- a/doc/development/testing_guide/flaky_tests.md +++ b/doc/development/testing_guide/flaky_tests.md @@ -8,7 +8,7 @@ eventually. ## Quarantined tests When a test frequently fails in `master`, -[a ~"broken master" issue](https://about.gitlab.com/handbook/engineering/workflow/#broken-master) +[a ~"master:broken" issue](https://about.gitlab.com/handbook/engineering/workflow/#broken-master) should be created. If the test cannot be fixed in a timely fashion, there is an impact on the productivity of all the developers, so it should be placed in quarantine by @@ -21,7 +21,7 @@ bin/rspec --tag quarantine ``` **Before putting a test in quarantine, you should make sure that a -~"broken master" issue exists for it so it won't stay in quarantine forever.** +~"master:broken" issue exists for it so it won't stay in quarantine forever.** Once a test is in quarantine, there are 3 choices: diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb index 3050f23c130..321da8f44d7 100644 --- a/spec/features/issues/issue_sidebar_spec.rb +++ b/spec/features/issues/issue_sidebar_spec.rb @@ -130,7 +130,7 @@ describe 'Issue Sidebar' do end end - context 'creating a project label', :js do + context 'creating a project label', :js, :quarantine do before do page.within('.block.labels') do click_link 'Create project' diff --git a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb index cf665cff262..b69fba0db00 100644 --- a/spec/features/issues/user_creates_branch_and_merge_request_spec.rb +++ b/spec/features/issues/user_creates_branch_and_merge_request_spec.rb @@ -29,7 +29,7 @@ describe 'User creates branch and merge request on issue page', :js do end # In order to improve tests performance, all UI checks are placed in this test. - it 'shows elements' do + it 'shows elements', :quarantine do button_create_merge_request = find('.js-create-merge-request') button_toggle_dropdown = find('.create-mr-dropdown-wrap .dropdown-toggle') diff --git a/spec/features/issues/user_interacts_with_awards_spec.rb b/spec/features/issues/user_interacts_with_awards_spec.rb index eaeaa04f50d..d117620a2b1 100644 --- a/spec/features/issues/user_interacts_with_awards_spec.rb +++ b/spec/features/issues/user_interacts_with_awards_spec.rb @@ -75,7 +75,7 @@ describe 'User interacts with awards' do end end - it 'shows the list of award emoji categories' do + it 'shows the list of award emoji categories', :quarantine do page.within('.awards') do page.find('.js-add-award').click end diff --git a/spec/services/quick_actions/interpret_service_spec.rb b/spec/services/quick_actions/interpret_service_spec.rb index c450f89c3cb..95a131e8c86 100644 --- a/spec/services/quick_actions/interpret_service_spec.rb +++ b/spec/services/quick_actions/interpret_service_spec.rb @@ -529,7 +529,7 @@ describe QuickActions::InterpretService do let(:issuable) { issue } end - it_behaves_like 'assign command' do + it_behaves_like 'assign command', :quarantine do let(:content) { "/assign @#{developer.username} @#{developer2.username}" } let(:issuable) { merge_request } end |