diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-18 16:55:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-18 16:55:41 +0000 |
| commit | 88479f7f3071c2d79447896deeea63fb78b175df (patch) | |
| tree | 6ede9ee5af909eb931938e50eb86a4f8128f0b94 /spec/requests | |
| parent | 9d4a45ef2123f9acf9e41dc8140d33ba1c162251 (diff) | |
| parent | 2fb862ccc6687273ada997743392d9dab7b31d08 (diff) | |
| download | gitlab-ce-88479f7f3071c2d79447896deeea63fb78b175df.tar.gz | |
Merge branch '24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-to-fail' into 'master'
Resolve "spec/lib/gitlab/backend/shell_spec.rb causes other specs to fail"
## What does this MR do?
It ensures we rely on `Gitlab::Shell`'s public API and not on its internal. Since `Gitlab::Shell` is caching the value of its token, the only way to get the correct token is to call `Gitlab::Shell.secret_token`, not to read the `Gitlab.config.gitlab_shell.secret_file` file!
Fixes #24599
See merge request !7557
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/internal_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index 8f1a1f9e827..03796f20e36 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -5,7 +5,7 @@ describe API::API, api: true do let(:user) { create(:user) } let(:key) { create(:key, user: user) } let(:project) { create(:project) } - let(:secret_token) { File.read Gitlab.config.gitlab_shell.secret_file } + let(:secret_token) { Gitlab::Shell.secret_token } describe "GET /internal/check", no_db: true do it do |