Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 26 deletions

diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
index 22e78c49ce5..4d6586c1df4 100644
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
@@ -206,32 +206,6 @@ describe Snippet do
     end
   end
 
-  describe '.find_by_id_and_project' do
-    let_it_be(:project) { create(:project) }
-    let_it_be(:project_snippet) { create(:project_snippet, project: project) }
-    let_it_be(:personal_snippet) { create(:personal_snippet) }
-
-    context 'when project is provided' do
-      it 'returns ProjectSnippet' do
-        expect(described_class.find_by_id_and_project(id: project_snippet.id, project: project)).to eq(project_snippet)
-      end
-    end
-
-    context 'when project is nil' do
-      it 'returns PersonalSnippet' do
-        expect(described_class.find_by_id_and_project(id: personal_snippet.id, project: nil)).to eq(personal_snippet)
-      end
-    end
-
-    context 'when project variable is not a Project' do
-      let(:namespace) { build_stubbed(:namespace, id: project.id) }
-
-      it 'returns nil' do
-        expect(described_class.find_by_id_and_project(id: project_snippet.id, project: namespace)).to be_nil
-      end
-    end
-  end
-
   describe '.with_optional_visibility' do
     context 'when a visibility level is provided' do
       it 'returns snippets with the given visibility' do