Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor

2 files changed, 45 insertions, 0 deletions

diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index c1080ef190a..eb3a5fe43f5 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -21,6 +21,18 @@ describe GitPushService, services: true do
       end
 
       it { is_expected.to be_truthy }
+
+      it 'flushes general cached data' do
+        expect(project.repository).to receive(:expire_cache).with('master')
+
+        subject
+      end
+
+      it 'flushes the visible content cache' do
+        expect(project.repository).to receive(:expire_has_visible_content_cache)
+
+        subject
+      end
     end
 
     context 'existing branch' do
@@ -29,6 +41,12 @@ describe GitPushService, services: true do
       end
 
       it { is_expected.to be_truthy }
+
+      it 'flushes general cached data' do
+        expect(project.repository).to receive(:expire_cache).with('master')
+
+        subject
+      end
     end
 
     context 'rm branch' do
@@ -37,6 +55,18 @@ describe GitPushService, services: true do
       end
 
       it { is_expected.to be_truthy }
+
+      it 'flushes the visible content cache' do
+        expect(project.repository).to receive(:expire_has_visible_content_cache)
+
+        subject
+      end
+
+      it 'flushes general cached data' do
+        expect(project.repository).to receive(:expire_cache).with('master')
+
+        subject
+      end
     end
   end
 
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index d3364a71022..1bdc03af12d 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -424,6 +424,21 @@ describe SystemNoteService, services: true do
           to be_falsey
       end
     end
+
+    context 'commit with cross-reference from fork' do
+      let(:author2) { create(:user) }
+      let(:forked_project) { Projects::ForkService.new(project, author2).execute }
+      let(:commit2) { forked_project.commit }
+
+      before do
+        described_class.cross_reference(noteable, commit0, author2)
+      end
+
+      it 'is true when a fork mentions an external issue' do
+        expect(described_class.cross_reference_exists?(noteable, commit2)).
+            to be true
+      end
+    end
   end
 
   include JiraServiceHelper