Add latest changes from gitlab-org/gitlab@master

5 files changed, 194 insertions, 37 deletions

diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index a677e17ab0c..f3e2ea50913 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -497,13 +497,13 @@ describe SessionsController do
   end
 
   describe '#set_current_context' do
+    let_it_be(:user) { create(:user) }
+
     before do
       set_devise_mapping(context: @request)
     end
 
     context 'when signed in' do
-      let_it_be(:user) { create(:user) }
-
       before do
         sign_in(user)
       end
@@ -535,5 +535,25 @@ describe SessionsController do
         get :new
       end
     end
+
+    context 'when the user becomes locked' do
+      before do
+        user.update!(failed_attempts: User.maximum_attempts.pred)
+      end
+
+      it 'sets the caller_id in the context' do
+        allow_any_instance_of(User).to receive(:lock_access!).and_wrap_original do |m, *args|
+          expect(Labkit::Context.current.to_h)
+            .to include('meta.caller_id' => 'SessionsController#create')
+          expect(Labkit::Context.current.to_h)
+            .not_to include('meta.user')
+
+          m.call(*args)
+        end
+
+        post(:create,
+             params: { user: { login: user.username, password: user.password.succ } })
+      end
+    end
   end
 end
diff --git a/spec/features/broadcast_messages_spec.rb b/spec/features/broadcast_messages_spec.rb
index d7c84b8085b..809e53ed7f7 100644
--- a/spec/features/broadcast_messages_spec.rb
+++ b/spec/features/broadcast_messages_spec.rb
@@ -57,4 +57,15 @@ describe 'Broadcast Messages' do
 
     it_behaves_like 'a dismissable Broadcast Messages'
   end
+
+  it 'renders broadcast message with placeholders' do
+    create(:broadcast_message, broadcast_type: 'notification', message: 'Hi {{name}}')
+
+    user = create(:user)
+    sign_in(user)
+
+    visit root_path
+
+    expect(page).to have_content "Hi #{user.name}"
+  end
 end
diff --git a/spec/helpers/broadcast_messages_helper_spec.rb b/spec/helpers/broadcast_messages_helper_spec.rb
index 69ff5f16ec1..58cc03a9446 100644
--- a/spec/helpers/broadcast_messages_helper_spec.rb
+++ b/spec/helpers/broadcast_messages_helper_spec.rb
@@ -27,10 +27,11 @@ describe BroadcastMessagesHelper do
   end
 
   describe 'broadcast_message' do
+    let_it_be(:user) { create(:user) }
     let(:current_broadcast_message) { BroadcastMessage.new(message: 'Current Message') }
 
     before do
-      allow(helper).to receive(:current_user).and_return(create(:user))
+      allow(helper).to receive(:current_user).and_return(user)
     end
 
     it 'returns nil when no current message' do
diff --git a/spec/lib/banzai/filter/broadcast_message_placeholders_filter_spec.rb b/spec/lib/banzai/filter/broadcast_message_placeholders_filter_spec.rb
new file mode 100644
index 00000000000..1a90abc12d9
--- /dev/null
+++ b/spec/lib/banzai/filter/broadcast_message_placeholders_filter_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Banzai::Filter::BroadcastMessagePlaceholdersFilter do
+  include FilterSpecHelper
+
+  subject { filter(text, current_user: user, broadcast_message_placeholders: true).to_html }
+
+  describe 'when current user is set' do
+    let_it_be(:user) { create(:user, email: "helloworld@example.com", name: "GitLab Tanunki :)") }
+
+    context 'replaces placeholder in text' do
+      let(:text) { 'Email: {{email}}' }
+
+      it { expect(subject).to eq("Email: #{user.email}") }
+    end
+
+    context 'replaces placeholder when they are in a link' do
+      let(:text) { '<a href="http://example.com?email={{email}}"">link</a>' }
+
+      it { expect(subject).to eq("<a href=\"http://example.com?email=helloworld%40example.com\">link</a>") }
+    end
+
+    context 'replaces placeholder when they are in an escaped link' do
+      let(:text) { '<a href="http://example.com?name=%7B%7Bname%7D%7D">link</a>' }
+
+      it { expect(subject).to eq("<a href=\"http://example.com?name=GitLab+Tanunki+%3A%29\">link</a>") }
+    end
+
+    context 'works with empty text' do
+      let(:text) {" "}
+
+      it { expect(subject).to eq(" ") }
+    end
+
+    context 'replaces multiple placeholders in a given text' do
+      let(:text) { "{{email}} {{name}}" }
+
+      it { expect(subject).to eq("#{user.email} #{user.name}") }
+    end
+
+    context 'available placeholders' do
+      context 'replaces the email of the user' do
+        let(:text) { "{{email}}"}
+
+        it { expect(subject).to eq(user.email) }
+      end
+
+      context 'replaces the name of the user' do
+        let(:text) { "{{name}}"}
+
+        it { expect(subject).to eq(user.name) }
+      end
+
+      context 'replaces the ID of the user' do
+        let(:text) { "{{user_id}}" }
+
+        it { expect(subject).to eq(user.id.to_s) }
+      end
+
+      context 'replaces the username of the user' do
+        let(:text) { "{{username}}" }
+
+        it { expect(subject).to eq(user.username) }
+      end
+
+      context 'replaces the instance_id' do
+        before do
+          stub_application_setting(uuid: '123')
+        end
+
+        let(:text) { "{{instance_id}}" }
+
+        it { expect(subject).to eq(Gitlab::CurrentSettings.uuid) }
+      end
+    end
+  end
+
+  describe 'when there is no current user set' do
+    let(:user) { nil }
+
+    context 'replaces placeholder with empty string' do
+      let(:text) { "Email: {{email}}" }
+
+      it { expect(subject).to eq("Email: ") }
+    end
+  end
+end
diff --git a/spec/services/labels/transfer_service_spec.rb b/spec/services/labels/transfer_service_spec.rb
index e29c6aeef5b..a2a9c8dddf2 100644
--- a/spec/services/labels/transfer_service_spec.rb
+++ b/spec/services/labels/transfer_service_spec.rb
@@ -4,65 +4,101 @@ require 'spec_helper'
 
 describe Labels::TransferService do
   describe '#execute' do
-    let(:user)    { create(:admin) }
-    let(:group_1) { create(:group) }
-    let(:group_2) { create(:group) }
-    let(:group_3) { create(:group) }
-    let(:project_1) { create(:project, namespace: group_2) }
-    let(:project_2) { create(:project, namespace: group_3) }
-    let(:project_3) { create(:project, namespace: group_1) }
-
-    let(:group_label_1) { create(:group_label, group: group_1, name: 'Group Label 1') }
-    let(:group_label_2) { create(:group_label, group: group_1, name: 'Group Label 2') }
-    let(:group_label_3) { create(:group_label, group: group_1, name: 'Group Label 3') }
-    let(:group_label_4) { create(:group_label, group: group_2, name: 'Group Label 4') }
-    let(:group_label_5) { create(:group_label, group: group_3, name: 'Group Label 5') }
-    let(:project_label_1) { create(:label, project: project_1, name: 'Project Label 1') }
-
-    subject(:service) { described_class.new(user, group_1, project_1) }
-
-    before do
-      create(:labeled_issue, project: project_1, labels: [group_label_1])
-      create(:labeled_issue, project: project_1, labels: [group_label_4])
-      create(:labeled_issue, project: project_1, labels: [project_label_1])
-      create(:labeled_issue, project: project_2, labels: [group_label_5])
-      create(:labeled_issue, project: project_3, labels: [group_label_1])
-      create(:labeled_merge_request, source_project: project_1, labels: [group_label_1, group_label_2])
-      create(:labeled_merge_request, source_project: project_2, labels: [group_label_5])
+    let_it_be(:user) { create(:admin) }
+
+    let_it_be(:old_group_ancestor) { create(:group) }
+    let_it_be(:old_group) { create(:group, parent: old_group_ancestor) }
+
+    let_it_be(:new_group) { create(:group) }
+
+    let_it_be(:project) { create(:project, :repository, group: new_group) }
+
+    subject(:service) { described_class.new(user, old_group, project) }
+
+    it 'recreates missing group labels at project level and assigns them to the issuables' do
+      old_group_label_1 = create(:group_label, group: old_group)
+      old_group_label_2 = create(:group_label, group: old_group)
+
+      labeled_issue = create(:labeled_issue, project: project, labels: [old_group_label_1])
+      labeled_merge_request = create(:labeled_merge_request, source_project: project, labels: [old_group_label_2])
+
+      expect { service.execute }.to change(project.labels, :count).by(2)
+      expect(labeled_issue.reload.labels).to contain_exactly(project.labels.find_by_title(old_group_label_1.title))
+      expect(labeled_merge_request.reload.labels).to contain_exactly(project.labels.find_by_title(old_group_label_2.title))
     end
 
-    it 'recreates the missing group labels at project level' do
-      expect { service.execute }.to change(project_1.labels, :count).by(2)
+    it 'recreates missing ancestor group labels at project level and assigns them to the issuables' do
+      old_group_ancestor_label_1 = create(:group_label, group: old_group_ancestor)
+      old_group_ancestor_label_2 = create(:group_label, group: old_group_ancestor)
+
+      labeled_issue = create(:labeled_issue, project: project, labels: [old_group_ancestor_label_1])
+      labeled_merge_request = create(:labeled_merge_request, source_project: project, labels: [old_group_ancestor_label_2])
+
+      expect { service.execute }.to change(project.labels, :count).by(2)
+      expect(labeled_issue.reload.labels).to contain_exactly(project.labels.find_by_title(old_group_ancestor_label_1.title))
+      expect(labeled_merge_request.reload.labels).to contain_exactly(project.labels.find_by_title(old_group_ancestor_label_2.title))
     end
 
     it 'recreates label priorities related to the missing group labels' do
-      create(:label_priority, project: project_1, label: group_label_1, priority: 1)
+      old_group_label = create(:group_label, group: old_group)
+      create(:labeled_issue, project: project, labels: [old_group_label])
+      create(:label_priority, project: project, label: old_group_label, priority: 1)
 
       service.execute
 
-      new_project_label = project_1.labels.find_by(title: group_label_1.title)
-      expect(new_project_label.id).not_to eq group_label_1.id
+      new_project_label = project.labels.find_by(title: old_group_label.title)
+      expect(new_project_label.id).not_to eq old_group_label.id
       expect(new_project_label.priorities).not_to be_empty
     end
 
     it 'does not recreate missing group labels that are not applied to issues or merge requests' do
+      old_group_label = create(:group_label, group: old_group)
+
       service.execute
 
-      expect(project_1.labels.where(title: group_label_3.title)).to be_empty
+      expect(project.labels.where(title: old_group_label.title)).to be_empty
     end
 
     it 'does not recreate missing group labels that already exist in the project group' do
+      old_group_label = create(:group_label, group: old_group)
+      labeled_issue = create(:labeled_issue, project: project, labels: [old_group_label])
+
+      new_group_label = create(:group_label, group: new_group, title: old_group_label.title)
+
       service.execute
 
-      expect(project_1.labels.where(title: group_label_4.title)).to be_empty
+      expect(project.labels.where(title: old_group_label.title)).to be_empty
+      expect(labeled_issue.reload.labels).to contain_exactly(new_group_label)
     end
 
     it 'updates only label links in the given project' do
+      old_group_label = create(:group_label, group: old_group)
+      other_project = create(:project, group: old_group)
+
+      labeled_issue = create(:labeled_issue, project: project, labels: [old_group_label])
+      other_project_labeled_issue = create(:labeled_issue, project: other_project, labels: [old_group_label])
+
       service.execute
 
-      targets = LabelLink.where(label_id: group_label_1.id).map(&:target)
+      expect(labeled_issue.reload.labels).not_to include(old_group_label)
+      expect(other_project_labeled_issue.reload.labels).to contain_exactly(old_group_label)
+    end
+
+    context 'when moving within the same ancestor group' do
+      let(:other_subgroup) { create(:group, parent: old_group_ancestor) }
+      let(:project) { create(:project, :repository, group: other_subgroup) }
+
+      it 'does not recreate ancestor group labels' do
+        old_group_ancestor_label_1 = create(:group_label, group: old_group_ancestor)
+        old_group_ancestor_label_2 = create(:group_label, group: old_group_ancestor)
+
+        labeled_issue = create(:labeled_issue, project: project, labels: [old_group_ancestor_label_1])
+        labeled_merge_request = create(:labeled_merge_request, source_project: project, labels: [old_group_ancestor_label_2])
 
-      expect(targets).to eq(project_3.issues)
+        expect { service.execute }.not_to change(project.labels, :count)
+        expect(labeled_issue.reload.labels).to contain_exactly(old_group_ancestor_label_1)
+        expect(labeled_merge_request.reload.labels).to contain_exactly(old_group_ancestor_label_2)
+      end
     end
   end
 end