diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-10-22 18:50:11 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-10-22 18:50:11 +0300 |
commit | 5adf178157837251d86f2b2d682e835acd0b0944 (patch) | |
tree | 39a2be29f0e057f2a575199b3f97c2eb2e7c0c4a /qa/spec | |
parent | 0ffcb08cacbb3efc793d010e098f6defbfa95010 (diff) | |
parent | e5f01cc8a170f07a1fe623a05ccb1de020b7ea87 (diff) |
Merge branch 'qa-backport-recent-ee-changes' into 'master'
[QA] Port recent changes from EE
See merge request gitlab-org/gitlab-ce!22391
Diffstat (limited to 'qa/spec')
-rw-r--r-- | qa/spec/git/repository_spec.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/qa/spec/git/repository_spec.rb b/qa/spec/git/repository_spec.rb index 53bff3bf0b3..c629f802aa4 100644 --- a/qa/spec/git/repository_spec.rb +++ b/qa/spec/git/repository_spec.rb @@ -1,17 +1,18 @@ describe QA::Git::Repository do + include Support::StubENV + let(:repository) { described_class.new } before do + stub_env('GITLAB_USERNAME', 'root') cd_empty_temp_directory set_bad_uri repository.use_default_credentials end describe '#clone' do - it 'redacts credentials from the URI in output' do - output, _ = repository.clone - - expect(output).to include("fatal: unable to access 'http://****@foo/bar.git/'") + it 'is unable to resolve host' do + expect(repository.clone).to include("fatal: unable to access 'http://root@foo/bar.git/'") end end @@ -20,10 +21,8 @@ describe QA::Git::Repository do `git init` # need a repo to push from end - it 'redacts credentials from the URI in output' do - output, _ = repository.push_changes - - expect(output).to include("error: failed to push some refs to 'http://****@foo/bar.git'") + it 'fails to push changes' do + expect(repository.push_changes).to include("error: failed to push some refs to 'http://root@foo/bar.git'") end end |