diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-11 09:59:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-11 09:59:25 +0000 |
| commit | 7d3bbeeb31731907456e8c4d5640e52e58a921fb (patch) | |
| tree | e6495c453cf449b8aa87845ec818798405323b9f /spec/requests/api/runner_spec.rb | |
| parent | a4f37e1834dbd755981b0ce19617e99b4ea43bb7 (diff) | |
| parent | b38c75b3dc2dc655377a1b4070cb6f5242594dbe (diff) | |
| download | gitlab-ce-7d3bbeeb31731907456e8c4d5640e52e58a921fb.tar.gz | |
Merge branch 'rs-update-rspec' into 'master'
Update rspec to 3.7
See merge request gitlab-org/gitlab-ce!19449
Diffstat (limited to 'spec/requests/api/runner_spec.rb')
| -rw-r--r-- | spec/requests/api/runner_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index 57d238ff79b..16e6f19773f 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -1085,8 +1085,8 @@ describe API::Runner, :clean_gitlab_redis_shared_state do let(:jwt_token) { JWT.encode({ 'iss' => 'gitlab-workhorse' }, Gitlab::Workhorse.secret, 'HS256') } let(:headers) { { 'GitLab-Workhorse' => '1.0', Gitlab::Workhorse::INTERNAL_API_REQUEST_HEADER => jwt_token } } let(:headers_with_token) { headers.merge(API::Helpers::Runner::JOB_TOKEN_HEADER => job.token) } - let(:file_upload) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') } - let(:file_upload2) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/gif') } + let(:file_upload) { fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif') } + let(:file_upload2) { fixture_file_upload('spec/fixtures/dk.png', 'image/gif') } before do stub_artifacts_object_storage |