Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 2 deletions

diff --git a/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb b/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb
index aca59079b3c..b64662f3782 100644
--- a/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb
+++ b/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb
@@ -60,8 +60,8 @@ describe Projects::LfsPointers::LfsLinkService do
       stub_const("#{described_class}::BATCH_SIZE", 1)
       oids = %w(one two)
 
-      expect(LfsObject).to receive(:where).with(oid: %w(one)).once.and_call_original
-      expect(LfsObject).to receive(:where).with(oid: %w(two)).once.and_call_original
+      expect(LfsObject).to receive(:for_oids).with(%w(one)).once.and_call_original
+      expect(LfsObject).to receive(:for_oids).with(%w(two)).once.and_call_original
 
       subject.execute(oids)
     end
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index 52ec80c252b..f561a303be4 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -82,6 +82,9 @@ describe Projects::UpdatePagesService do
 
         expect(execute).not_to eq(:success)
         expect(project.pages_metadatum).not_to be_deployed
+
+        expect(deploy_status).to be_failed
+        expect(deploy_status.description).to eq('build SHA is outdated for this ref')
       end
 
       context 'when using empty file' do