diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 12:19:33 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 12:19:33 +0000 |
| commit | a49d5271fb70e51fbe25dddbc2877b6e332aed0d (patch) | |
| tree | 7c646294ea520e6139563799761957ed418b2088 | |
| parent | aaf37ead9252d2c903ebfd8e3fd7914ba6cbd765 (diff) | |
| parent | 0c83f747ec68c08e84c59e5f1c2d4241e733a199 (diff) | |
| download | gitlab-ce-a49d5271fb70e51fbe25dddbc2877b6e332aed0d.tar.gz | |
Merge branch 'pdf-test-fix' into 'master'
Fixed PDF blob specs
See merge request !11025
| -rw-r--r-- | spec/features/projects/blobs/blob_show_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb index 6a6f8b4f4d5..8dba2ccbafa 100644 --- a/spec/features/projects/blobs/blob_show_spec.rb +++ b/spec/features/projects/blobs/blob_show_spec.rb @@ -231,7 +231,7 @@ feature 'File blob', :js, feature: true do branch_name: 'master', commit_message: "Add PDF", file_path: 'files/test.pdf', - file_content: File.read(Rails.root.join('spec/javascripts/blob/pdf/test.pdf')) + file_content: project.repository.blob_at('add-pdf-file', 'files/pdf/test.pdf').data ).execute visit_blob('files/test.pdf') |