Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 47 deletions

diff --git a/spec/models/zoom_meeting_spec.rb b/spec/models/zoom_meeting_spec.rb
index d496b968f1e..3dad957a1ce 100644
--- a/spec/models/zoom_meeting_spec.rb
+++ b/spec/models/zoom_meeting_spec.rb
@@ -151,51 +151,4 @@ describe ZoomMeeting do
       it_behaves_like 'can remove meetings'
     end
   end
-
-  describe '.distinct_count_by' do
-    let(:issue_1) { create(:issue) }
-    let(:issue_2) { create(:issue) }
-
-    context 'two meetings for the same issue' do
-      before do
-        create(:zoom_meeting, issue: issue_1)
-        create(:zoom_meeting, :removed_from_issue, issue: issue_1)
-      end
-
-      it 'returns a count of 1' do
-        expect(described_class.distinct_count_by(:issue_id)).to eq(1)
-      end
-
-      context 'when given no colum to count' do
-        it 'counts by :id and returns a count of 2' do
-          expect(described_class.distinct_count_by).to eq(2)
-        end
-      end
-    end
-
-    context 'one meeting for each issue' do
-      it 'returns a count of 2' do
-        create(:zoom_meeting, issue: issue_1)
-        create(:zoom_meeting, issue: issue_2)
-
-        expect(described_class.distinct_count_by(:issue_id)).to eq(2)
-      end
-    end
-
-    context 'the count query times out' do
-      before do
-        allow_next_instance_of(ActiveRecord::Relation) do |instance|
-          allow(instance).to receive(:count).and_raise(ActiveRecord::StatementInvalid.new(''))
-        end
-      end
-
-      it 'does not raise an error' do
-        expect { described_class.distinct_count_by(:issue_id) }.not_to raise_error
-      end
-
-      it 'returns -1' do
-        expect(described_class.distinct_count_by(:issue_id)).to eq(-1)
-      end
-    end
-  end
 end