Merge branch 'rs-spec-models-parity' into 'master'

CE-EE parity for spec/models

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

spec/models/repository_spec.rb

@@ -46,7 +46,7 @@ describe Repository do
       it { is_expected.not_to include('feature') }
       it { is_expected.not_to include('fix') }
 
-      describe 'when storage is broken', :broken_storage  do
+      describe 'when storage is broken', :broken_storage do
         it 'should raise a storage error' do
           expect_to_raise_storage_error do
             broken_repository.branch_names_contains(sample_commit.id)
@@ -192,7 +192,7 @@ describe Repository do
 
       it { is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8') }
 
-      describe 'when storage is broken', :broken_storage  do
+      describe 'when storage is broken', :broken_storage do
         it 'should raise a storage error' do
           expect_to_raise_storage_error do
             broken_repository.last_commit_id_for_path(sample_commit.id, '.gitignore')
@@ -226,7 +226,7 @@ describe Repository do
         is_expected.to eq('c1acaa5')
       end
 
-      describe 'when storage is broken', :broken_storage  do
+      describe 'when storage is broken', :broken_storage do
         it 'should raise a storage error' do
           expect_to_raise_storage_error do
             broken_repository.last_commit_for_path(sample_commit.id, '.gitignore').id
@@ -391,7 +391,7 @@ describe Repository do
       it_behaves_like 'finding commits by message'
     end
 
-    describe 'when storage is broken', :broken_storage  do
+    describe 'when storage is broken', :broken_storage do
       it 'should raise a storage error' do
         expect_to_raise_storage_error { broken_repository.find_commits_by_message('s') }
       end
@@ -695,7 +695,7 @@ describe Repository do
       expect(results).to match_array([])
     end
 
-    describe 'when storage is broken', :broken_storage  do
+    describe 'when storage is broken', :broken_storage do
       it 'should raise a storage error' do
         expect_to_raise_storage_error do
           broken_repository.search_files_by_content('feature', 'master')
@@ -744,7 +744,7 @@ describe Repository do
       expect(results).to match_array([])
     end
 
-    describe 'when storage is broken', :broken_storage  do
+    describe 'when storage is broken', :broken_storage do
       it 'should raise a storage error' do
         expect_to_raise_storage_error { broken_repository.search_files_by_name('files', 'master') }
       end
@@ -796,7 +796,7 @@ describe Repository do
   describe '#fetch_ref' do
     let(:broken_repository) { create(:project, :broken_storage).repository }
 
-    describe 'when storage is broken', :broken_storage  do
+    describe 'when storage is broken', :broken_storage do
       it 'should raise a storage error' do
         expect_to_raise_storage_error do
           broken_repository.fetch_ref(broken_repository, source_ref: '1', target_ref: '2')
@@ -2294,6 +2294,28 @@ describe Repository do
     end
   end
 
+  describe '#local_branches' do
+    it 'returns the local branches' do
+      masterrev = repository.find_branch('master').dereferenced_target
+      create_remote_branch('joe', 'remote_branch', masterrev)
+      repository.add_branch(user, 'local_branch', masterrev.id)
+
+      expect(repository.local_branches.any? { |branch| branch.name == 'remote_branch' }).to eq(false)
+      expect(repository.local_branches.any? { |branch| branch.name == 'local_branch' }).to eq(true)
+    end
+  end
+
+  describe '#remote_branches' do
+    it 'returns the remote branches' do
+      masterrev = repository.find_branch('master').dereferenced_target
+      create_remote_branch('joe', 'remote_branch', masterrev)
+      repository.add_branch(user, 'local_branch', masterrev.id)
+
+      expect(repository.remote_branches('joe').any? { |branch| branch.name == 'local_branch' }).to eq(false)
+      expect(repository.remote_branches('joe').any? { |branch| branch.name == 'remote_branch' }).to eq(true)
+    end
+  end
+
   describe '#commit_count' do
     context 'with a non-existing repository' do
       it 'returns 0' do