Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

6 files changed, 134 insertions, 57 deletions

diff --git a/spec/support/shared_examples/features/board_sidebar_labels_examples.rb b/spec/support/shared_examples/features/board_sidebar_labels_examples.rb
new file mode 100644
index 00000000000..520980c2615
--- /dev/null
+++ b/spec/support/shared_examples/features/board_sidebar_labels_examples.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+RSpec.shared_context 'labels from nested groups and projects' do
+  let_it_be(:group) { create(:group) }
+  let_it_be(:group_label) { create(:group_label, group: group, name: 'Group label') }
+  let_it_be(:project) { create(:project, group: group) }
+  let_it_be(:project_label) { create(:label, project: project, name: 'Project label') }
+
+  let_it_be(:subgroup) { create(:group, parent: group) }
+  let_it_be(:subgroup_label) { create(:group_label, group: subgroup, name: 'Subgroup label') }
+  let_it_be(:subproject) { create(:project, group: subgroup) }
+  let_it_be(:subproject_label) { create(:label, project: subproject, name: 'Subproject label') }
+
+  let_it_be(:subgroup2) { create(:group, parent: group) }
+  let_it_be(:subgroup2_label) { create(:group_label, group: subgroup2, name: 'Subgroup2 label') }
+
+  let_it_be(:maintainer) { create(:user) }
+
+  let(:labels_select) { find("[data-testid='sidebar-labels']") }
+  let(:labels_dropdown) { labels_select.find('[data-testid="dropdown-content"]')}
+
+  before do
+    group.add_maintainer(maintainer)
+
+    sign_in(maintainer)
+  end
+end
+
+RSpec.shared_examples "an issue from a subgroup's project is selected" do
+  context 'when editing labels' do
+    before do
+      click_card_and_edit_label
+    end
+
+    it 'displays the label from the top-level group' do
+      expect(labels_dropdown).to have_content(group_label.name)
+    end
+
+    it 'displays the label from the subgroup' do
+      expect(labels_dropdown).to have_content(subgroup_label.name)
+    end
+
+    it 'displays the label from the project' do
+      expect(labels_dropdown).to have_content(subproject_label.name)
+    end
+
+    it "does not display labels from the subgroup's siblings (project or group)" do
+      aggregate_failures do
+        expect(labels_dropdown).not_to have_content(project_label.name)
+        expect(labels_dropdown).not_to have_content(subgroup2_label.name)
+      end
+    end
+  end
+end
+
+RSpec.shared_examples 'an issue from a direct descendant project is selected' do
+  context 'when editing labels' do
+    before do
+      click_card_and_edit_label
+    end
+
+    it 'displays the label from the top-level group' do
+      expect(labels_dropdown).to have_content(group_label.name)
+    end
+
+    it 'displays the label from the project' do
+      expect(labels_dropdown).to have_content(project_label.name)
+    end
+
+    it "does not display labels from the project's siblings or their descendents" do
+      aggregate_failures do
+        expect(labels_dropdown).not_to have_content(subgroup_label.name)
+        expect(labels_dropdown).not_to have_content(subproject_label.name)
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb b/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb
index 49c3674277d..736c353c2aa 100644
--- a/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb
+++ b/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb
@@ -22,32 +22,7 @@ RSpec.shared_examples 'issuable invite members experiments' do
     end
   end
 
-  context 'when invite_members_version_b experiment is enabled' do
-    before do
-      stub_experiment_for_subject(invite_members_version_b: true)
-    end
-
-    it 'shows a link for inviting members and follows through to modal' do
-      project.add_developer(user)
-      visit issuable_path
-
-      find('.block.assignee .edit-link').click
-
-      wait_for_requests
-
-      page.within '.dropdown-menu-user' do
-        expect(page).to have_link('Invite Members', href: '#')
-        expect(page).to have_selector('[data-track-event="click_invite_members_version_b"]')
-        expect(page).to have_selector('[data-track-label="edit_assignee"]')
-      end
-
-      click_link 'Invite Members'
-
-      expect(page).to have_content("Oops, this feature isn't ready yet")
-    end
-  end
-
-  context 'when invite_members_version_b experiment is disabled' do
+  context 'when user cannot invite members in assignee dropdown' do
     it 'shows author in assignee dropdown and no invite link' do
       project.add_developer(user)
       visit issuable_path
diff --git a/spec/support/shared_examples/features/sidebar_shared_examples.rb b/spec/support/shared_examples/features/sidebar_shared_examples.rb
index 429efbe6ba0..c9508818f74 100644
--- a/spec/support/shared_examples/features/sidebar_shared_examples.rb
+++ b/spec/support/shared_examples/features/sidebar_shared_examples.rb
@@ -44,22 +44,24 @@ RSpec.shared_examples 'issue boards sidebar' do
   context 'in notifications subscription' do
     it 'displays notifications toggle', :aggregate_failures do
       page.within('[data-testid="sidebar-notifications"]') do
-        expect(page).to have_selector('[data-testid="notification-subscribe-toggle"]')
+        expect(page).to have_selector('[data-testid="subscription-toggle"]')
         expect(page).to have_content('Notifications')
-        expect(page).not_to have_content('Notifications have been disabled by the project or group owner')
+        expect(page).not_to have_content('Disabled by project owner')
       end
     end
 
     it 'shows toggle as on then as off as user toggles to subscribe and unsubscribe', :aggregate_failures do
-      toggle = find('[data-testid="notification-subscribe-toggle"]')
+      wait_for_requests
 
-      toggle.click
+      click_button 'Notifications'
 
-      expect(toggle).to have_css("button.is-checked")
+      expect(page).to have_button('Notifications', class: 'is-checked')
 
-      toggle.click
+      click_button 'Notifications'
 
-      expect(toggle).not_to have_css("button.is-checked")
+      wait_for_requests
+
+      expect(page).not_to have_button('Notifications', class: 'is-checked')
     end
 
     context 'when notifications have been disabled' do
@@ -71,9 +73,28 @@ RSpec.shared_examples 'issue boards sidebar' do
 
       it 'displays a message that notifications have been disabled' do
         page.within('[data-testid="sidebar-notifications"]') do
-          expect(page).not_to have_selector('[data-testid="notification-subscribe-toggle"]')
-          expect(page).to have_content('Notifications have been disabled by the project or group owner')
+          expect(page).to have_button('Notifications', class: 'is-disabled')
+          expect(page).to have_content('Disabled by project owner')
+        end
+      end
+    end
+  end
+
+  context 'confidentiality' do
+    it 'make issue confidential' do
+      page.within('.confidentiality') do
+        expect(page).to have_content('Not confidential')
+
+        click_button 'Edit'
+        expect(page).to have_css('.sidebar-item-warning-message')
+
+        within('.sidebar-item-warning-message') do
+          click_button 'Turn on'
         end
+
+        wait_for_requests
+
+        expect(page).to have_content('This issue is confidential')
       end
     end
   end
diff --git a/spec/support/shared_examples/features/variable_list_shared_examples.rb b/spec/support/shared_examples/features/variable_list_shared_examples.rb
index 2fd88b610e9..4b94411f009 100644
--- a/spec/support/shared_examples/features/variable_list_shared_examples.rb
+++ b/spec/support/shared_examples/features/variable_list_shared_examples.rb
@@ -8,7 +8,7 @@ RSpec.shared_examples 'variable list' do
   end
 
   it 'adds a new CI variable' do
-    click_button('Add Variable')
+    click_button('Add variable')
 
     fill_variable('key', 'key_value') do
       click_button('Add variable')
@@ -22,7 +22,7 @@ RSpec.shared_examples 'variable list' do
   end
 
   it 'adds a new protected variable' do
-    click_button('Add Variable')
+    click_button('Add variable')
 
     fill_variable('key', 'key_value') do
       click_button('Add variable')
@@ -37,7 +37,7 @@ RSpec.shared_examples 'variable list' do
   end
 
   it 'defaults to unmasked' do
-    click_button('Add Variable')
+    click_button('Add variable')
 
     fill_variable('key', 'key_value') do
       click_button('Add variable')
@@ -149,7 +149,7 @@ RSpec.shared_examples 'variable list' do
   end
 
   it 'shows a validation error box about duplicate keys' do
-    click_button('Add Variable')
+    click_button('Add variable')
 
     fill_variable('key', 'key_value') do
       click_button('Add variable')
@@ -157,7 +157,7 @@ RSpec.shared_examples 'variable list' do
 
     wait_for_requests
 
-    click_button('Add Variable')
+    click_button('Add variable')
 
     fill_variable('key', 'key_value') do
       click_button('Add variable')
@@ -170,7 +170,7 @@ RSpec.shared_examples 'variable list' do
   end
 
   it 'prevents a variable to be added if no values are provided when a variable is set to masked' do
-    click_button('Add Variable')
+    click_button('Add variable')
 
     page.within('#add-ci-variable') do
       find('[data-qa-selector="ci_variable_key_field"] input').set('empty_mask_key')
@@ -182,7 +182,7 @@ RSpec.shared_examples 'variable list' do
   end
 
   it 'shows validation error box about unmaskable values' do
-    click_button('Add Variable')
+    click_button('Add variable')
 
     fill_variable('empty_mask_key', '???', protected: true, masked: true) do
       expect(page).to have_content('This variable can not be masked')
@@ -192,7 +192,7 @@ RSpec.shared_examples 'variable list' do
 
   it 'handles multiple edits and a deletion' do
     # Create two variables
-    click_button('Add Variable')
+    click_button('Add variable')
 
     fill_variable('akey', 'akeyvalue') do
       click_button('Add variable')
@@ -200,7 +200,7 @@ RSpec.shared_examples 'variable list' do
 
     wait_for_requests
 
-    click_button('Add Variable')
+    click_button('Add variable')
 
     fill_variable('zkey', 'zkeyvalue') do
       click_button('Add variable')
@@ -224,7 +224,7 @@ RSpec.shared_examples 'variable list' do
     wait_for_requests
 
     # Add another variable
-    click_button('Add Variable')
+    click_button('Add variable')
 
     fill_variable('ckey', 'ckeyvalue') do
       click_button('Add variable')
@@ -249,7 +249,7 @@ RSpec.shared_examples 'variable list' do
       end
 
       it 'defaults to protected' do
-        click_button('Add Variable')
+        click_button('Add variable')
 
         page.within('#add-ci-variable') do
           expect(find('[data-testid="ci-variable-protected-checkbox"]')).to be_checked
@@ -269,7 +269,7 @@ RSpec.shared_examples 'variable list' do
       end
 
       it 'defaults to unprotected' do
-        click_button('Add Variable')
+        click_button('Add variable')
 
         page.within('#add-ci-variable') do
           expect(find('[data-testid="ci-variable-protected-checkbox"]')).not_to be_checked
diff --git a/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
index 8a6d5d88ca6..f2576931642 100644
--- a/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb
@@ -24,8 +24,8 @@ RSpec.shared_examples 'User creates wiki page' do
       page.within(".wiki-form") do
         fill_in(:wiki_content, with: "")
 
-        page.execute_script("window.onbeforeunload = null")
         page.execute_script("document.querySelector('.wiki-form').submit()")
+        page.accept_alert # manually force form submit
       end
 
       expect(page).to have_content("The form contains the following error:").and have_content("Content can't be blank")
diff --git a/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb b/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb
index d185e9dd81c..db2a96d9649 100644
--- a/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb
+++ b/spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb
@@ -93,8 +93,8 @@ RSpec.shared_examples 'User updates wiki page' do
     it 'shows a validation error message if the form is force submitted', :js do
       fill_in(:wiki_content, with: '')
 
-      page.execute_script("window.onbeforeunload = null")
       page.execute_script("document.querySelector('.wiki-form').submit()")
+      page.accept_alert # manually force form submit
 
       expect(page).to have_selector('.wiki-form')
       expect(page).to have_content('Edit Page')
@@ -117,14 +117,6 @@ RSpec.shared_examples 'User updates wiki page' do
       expect(page).to have_selector('.atwho-view')
     end
 
-    it 'shows the error message', :js do
-      wiki_page.update(content: 'Update') # rubocop:disable Rails/SaveBang
-
-      click_button('Save changes')
-
-      expect(page).to have_content('Someone edited the page the same time you did.')
-    end
-
     it 'updates a page', :js do
       fill_in('Content', with: 'Updated Wiki Content')
       click_on('Save changes')
@@ -145,6 +137,18 @@ RSpec.shared_examples 'User updates wiki page' do
     end
 
     it_behaves_like 'wiki file attachments'
+
+    context 'when multiple people edit the page at the same time' do
+      it 'preserves user changes in the wiki editor', :js do
+        wiki_page.update(content: 'Some Other Updates') # rubocop:disable Rails/SaveBang
+
+        fill_in('Content', with: 'Updated Wiki Content')
+        click_on('Save changes')
+
+        expect(page).to have_content('Someone edited the page the same time you did.')
+        expect(find('textarea#wiki_content').value).to eq('Updated Wiki Content')
+      end
+    end
   end
 
   context 'when the page is in a subdir', :js do