Commit 0e41281e authored by Rémy Coutable's avatar Rémy Coutable Committed by Ruben Davila

Merge branch '24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-to-fail' into 'master'

Rely on Gitlab::Shell public API, not reading internal files it may use

EE brother of gitlab-org/gitlab-ce!7557 so that specs can pass on EE until the CE->EE merge (no need to pick it into stable since the CE MR will be picked already).

See merge request !887
parent f0831056
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment