Merge two methods.

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 9c66bbdb5f3..af7e89eae05 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -142,16 +142,16 @@ describe Repository, models: true do
   describe '#last_commit_id_for_path' do
     subject { repository.last_commit_id_for_path(sample_commit.id, '.gitignore') }
 
-    it { is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8') }
-  end
+    it "returns last commit id for a given path" do
+      is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8')
+    end
 
-  describe '#cache_last_commit_id_for_path' do
-    it "caches #last_commit_id_for_path" do
+    it "caches last commit id for a given path" do
       cache = repository.send(:cache)
       key = "last_commit_id_for_path:#{sample_commit.id}:#{Digest::SHA1.hexdigest('.gitignore')}"
 
       expect(cache).to receive(:fetch).with(key).and_return('c1acaa5')
-      expect(repository.cache_last_commit_id_for_path(sample_commit.id, '.gitignore')).to eq('c1acaa5')
+      is_expected.to eq('c1acaa5')
     end
   end