Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 39 deletions

diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 2f033559b0c..c0cea29941e 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -4589,24 +4589,6 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do
         end
       end
     end
-
-    describe '#find_stage_by_name' do
-      subject { pipeline.find_stage_by_name!(stage_name) }
-
-      context 'when stage exists' do
-        it { is_expected.to eq(stage) }
-      end
-
-      context 'when stage does not exist' do
-        let(:stage_name) { 'build' }
-
-        it 'raises an ActiveRecord exception' do
-          expect do
-            subject
-          end.to raise_exception(ActiveRecord::RecordNotFound)
-        end
-      end
-    end
   end
 
   describe '#full_error_messages' do
diff --git a/spec/models/oauth_access_token_spec.rb b/spec/models/oauth_access_token_spec.rb
index 2b47da1ebe1..2d617e0c7b3 100644
--- a/spec/models/oauth_access_token_spec.rb
+++ b/spec/models/oauth_access_token_spec.rb
@@ -10,27 +10,6 @@ RSpec.describe OauthAccessToken do
   let(:token) { create(:oauth_access_token, application_id: app_one.id) }
 
   describe 'scopes' do
-    describe '.distinct_resource_owner_counts' do
-      let(:tokens) { described_class.all }
-
-      before do
-        token
-        create_list(:oauth_access_token, 2, resource_owner: user, application_id: app_two.id)
-      end
-
-      it 'returns unique owners' do
-        expect(tokens.count).to eq(3)
-        expect(tokens.distinct_resource_owner_counts([app_one])).to eq({ app_one.id => 1 })
-        expect(tokens.distinct_resource_owner_counts([app_two])).to eq({ app_two.id => 1 })
-        expect(tokens.distinct_resource_owner_counts([app_three])).to eq({})
-        expect(tokens.distinct_resource_owner_counts([app_one, app_two]))
-          .to eq({
-                   app_one.id => 1,
-                   app_two.id => 1
-                 })
-      end
-    end
-
     describe '.latest_per_application' do
       let!(:app_two_token1) { create(:oauth_access_token, application: app_two) }
       let!(:app_two_token2) { create(:oauth_access_token, application: app_two) }