Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 74 deletions

diff --git a/spec/services/ci/play_build_service_spec.rb b/spec/services/ci/play_build_service_spec.rb
index babd601e0cf..34f77260334 100644
--- a/spec/services/ci/play_build_service_spec.rb
+++ b/spec/services/ci/play_build_service_spec.rb
@@ -79,12 +79,22 @@ RSpec.describe Ci::PlayBuildService, '#execute' do
          { key: 'second', secret_value: 'second' }]
       end
 
+      subject { service.execute(build, job_variables) }
+
       it 'assigns the variables to the build' do
-        service.execute(build, job_variables)
+        subject
 
         expect(build.reload.job_variables.map(&:key)).to contain_exactly('first', 'second')
       end
 
+      context 'when variables are invalid' do
+        let(:job_variables) { [{}] }
+
+        it 'raises an error' do
+          expect { subject }.to raise_error(ActiveRecord::RecordInvalid)
+        end
+      end
+
       context 'when user defined variables are restricted' do
         before do
           project.update!(restrict_user_defined_variables: true)
@@ -96,7 +106,7 @@ RSpec.describe Ci::PlayBuildService, '#execute' do
           end
 
           it 'assigns the variables to the build' do
-            service.execute(build, job_variables)
+            subject
 
             expect(build.reload.job_variables.map(&:key)).to contain_exactly('first', 'second')
           end
@@ -104,8 +114,7 @@ RSpec.describe Ci::PlayBuildService, '#execute' do
 
         context 'when user is developer' do
           it 'raises an error' do
-            expect { service.execute(build, job_variables) }
-              .to raise_error Gitlab::Access::AccessDeniedError
+            expect { subject }.to raise_error Gitlab::Access::AccessDeniedError
           end
         end
       end
diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb
index 43493deb621..13f56fe7458 100644
--- a/spec/services/members/create_service_spec.rb
+++ b/spec/services/members/create_service_spec.rb
@@ -127,76 +127,6 @@ RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_
     end
   end
 
-  context 'when tracking the areas of focus', :snowplow do
-    context 'when areas_of_focus is not passed' do
-      it 'does not track' do
-        execute_service
-
-        expect_no_snowplow_event(category: described_class.name, action: 'area_of_focus')
-      end
-    end
-
-    context 'when 1 areas_of_focus is passed' do
-      let(:additional_params) { { invite_source: '_invite_source_', areas_of_focus: ['no_selection'] } }
-
-      it 'tracks the areas_of_focus from params' do
-        execute_service
-
-        expect_snowplow_event(
-          category: described_class.name,
-          action: 'area_of_focus',
-          label: 'no_selection',
-          property: source.members.last.id.to_s
-        )
-      end
-
-      context 'when passing many user ids' do
-        let(:another_user) { create(:user) }
-        let(:user_ids) { [member.id, another_user.id].join(',') }
-
-        it 'tracks the areas_of_focus from params' do
-          execute_service
-
-          members = source.members.last(2)
-
-          expect_snowplow_event(
-            category: described_class.name,
-            action: 'area_of_focus',
-            label: 'no_selection',
-            property: members.first.id.to_s
-          )
-          expect_snowplow_event(
-            category: described_class.name,
-            action: 'area_of_focus',
-            label: 'no_selection',
-            property: members.last.id.to_s
-          )
-        end
-      end
-    end
-
-    context 'when multiple areas_of_focus are passed' do
-      let(:additional_params) { { invite_source: '_invite_source_', areas_of_focus: %w[no_selection Other] } }
-
-      it 'tracks the areas_of_focus from params' do
-        execute_service
-
-        expect_snowplow_event(
-          category: described_class.name,
-          action: 'area_of_focus',
-          label: 'no_selection',
-          property: source.members.last.id.to_s
-        )
-        expect_snowplow_event(
-          category: described_class.name,
-          action: 'area_of_focus',
-          label: 'Other',
-          property: source.members.last.id.to_s
-        )
-      end
-    end
-  end
-
   context 'when assigning tasks to be done' do
     let(:additional_params) do
       { invite_source: '_invite_source_', tasks_to_be_done: %w(ci code), tasks_project_id: source.id }