diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb b/spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb index c78b838d0df..55ab0f0eefa 100644 --- a/spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb +++ b/spec/controllers/projects/design_management/designs/raw_images_controller_spec.rb @@ -109,7 +109,7 @@ RSpec.describe Projects::DesignManagement::Designs::RawImagesController do context 'when sha is nil' do let(:sha) { nil } - let(:expected_ref) { 'master' } + let(:expected_ref) { project.design_repository.root_ref } it_behaves_like 'a successful request for sha' end @@ -147,7 +147,7 @@ RSpec.describe Projects::DesignManagement::Designs::RawImagesController do let(:file) { fixture_file_upload('spec/fixtures/dk.png', '`/png') } let(:lfs_pointer) { Gitlab::Git::LfsPointerFile.new(file.read) } let(:design) { create(:design, :with_lfs_file, file: lfs_pointer.pointer, issue: issue) } - let(:lfs_oid) { project.design_repository.blob_at('HEAD', design.full_path).lfs_oid } + let(:lfs_oid) { project.design_repository.blob_at(design.repository.root_ref, design.full_path).lfs_oid } let(:filepath) { design.full_path } end end |