Merge branch '9841-geo-unable-to-compare-branches-on-secondary' into 'master'

Allow users to compare branches on a read-only instance

See merge request gitlab-org/gitlab-ce!25414

1 files changed, 32 insertions, 0 deletions

diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb
index 97757e8da92..ee71c843b80 100644
--- a/spec/features/projects/branches_spec.rb
+++ b/spec/features/projects/branches_spec.rb
@@ -229,6 +229,38 @@ describe 'Branches' do
     end
   end
 
+  describe 'comparing branches' do
+    before do
+      sign_in(user)
+      project.add_developer(user)
+    end
+
+    shared_examples 'compares branches' do
+      it 'compares branches' do
+        visit project_branches_path(project)
+
+        page.within first('.all-branches li') do
+          click_link 'Compare'
+        end
+
+        expect(page).to have_content 'Commits'
+        expect(page).to have_link 'Create merge request'
+      end
+    end
+
+    context 'on a read-only instance' do
+      before do
+        allow(Gitlab::Database).to receive(:read_only?).and_return(true)
+      end
+
+      it_behaves_like 'compares branches'
+    end
+
+    context 'on a read-write instance' do
+      it_behaves_like 'compares branches'
+    end
+  end
+
   def sorted_branches(repository, count:, sort_by:, state: nil)
     branches = repository.branches_sorted_by(sort_by)
     branches = branches.select { |b| state == 'active' ? b.active? : b.stale? } if state