diff options
author | Justin DiPierro <dipierroj@gmail.com> | 2016-09-29 19:46:54 +0300 |
---|---|---|
committer | Justin DiPierro <dipierroj@gmail.com> | 2016-10-06 18:22:37 +0300 |
commit | fe46e4eb35dd6728a8a5ebcee9cc05a4613effbf (patch) | |
tree | 241a0fad11b7719f193f3deb6b8818c37159ec8c /spec/lib/gitlab/backend | |
parent | 9a13f885a9dc7b072d41160a6d3db965c9114b4b (diff) |
Load Github::Shell's secret token from file on initialization instead of every request.
Diffstat (limited to 'spec/lib/gitlab/backend')
-rw-r--r-- | spec/lib/gitlab/backend/shell_spec.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/lib/gitlab/backend/shell_spec.rb b/spec/lib/gitlab/backend/shell_spec.rb index 07407f212aa..c9c7ef8f479 100644 --- a/spec/lib/gitlab/backend/shell_spec.rb +++ b/spec/lib/gitlab/backend/shell_spec.rb @@ -22,15 +22,14 @@ describe Gitlab::Shell, lib: true do it { expect(gitlab_shell.url_to_repo('diaspora')).to eq(Gitlab.config.gitlab_shell.ssh_path_prefix + "diaspora.git") } - describe 'generate_and_link_secret_token' do + describe 'memoized secret_token' do let(:secret_file) { 'tmp/tests/.secret_shell_test' } let(:link_file) { 'tmp/tests/shell-secret-test/.gitlab_shell_secret' } before do - allow(Gitlab.config.gitlab_shell).to receive(:path).and_return('tmp/tests/shell-secret-test') allow(Gitlab.config.gitlab_shell).to receive(:secret_file).and_return(secret_file) + allow(Gitlab.config.gitlab_shell).to receive(:path).and_return('tmp/tests/shell-secret-test') FileUtils.mkdir('tmp/tests/shell-secret-test') - gitlab_shell.generate_and_link_secret_token end after do @@ -39,7 +38,10 @@ describe Gitlab::Shell, lib: true do end it 'creates and links the secret token file' do + secret_token = Gitlab::Shell.secret_token + expect(File.exist?(secret_file)).to be(true) + expect(File.read(secret_file).chomp).to eq(secret_token) expect(File.symlink?(link_file)).to be(true) expect(File.readlink(link_file)).to eq(secret_file) end |