diff options
author | Robert Speicher <robert@gitlab.com> | 2017-07-21 13:51:50 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-07-21 13:51:50 +0000 |
commit | 87499a8f9c8221e5600a4dad928e2ce118f18157 (patch) | |
tree | 7292b5171228c2fbf59a9eba4b7fe3452602a6e3 /spec | |
parent | 83481414341b7ebb82b5a3d948b39e95fdca5289 (diff) | |
parent | c9c0606297883a3a47a5e5e9433e495dc89938c7 (diff) | |
download | gitlab-ce-87499a8f9c8221e5600a4dad928e2ce118f18157.tar.gz |
Merge branch '34788-testenv-doesn-t-update-the-component-correctly-when-a-branch-is-specified' into 'master'
Improve version handling on component install tasks
Closes #34788
See merge request !13006
Diffstat (limited to 'spec')
-rw-r--r-- | spec/tasks/gitlab/task_helpers_spec.rb | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/spec/tasks/gitlab/task_helpers_spec.rb b/spec/tasks/gitlab/task_helpers_spec.rb index 91cc684d032..d34617be474 100644 --- a/spec/tasks/gitlab/task_helpers_spec.rb +++ b/spec/tasks/gitlab/task_helpers_spec.rb @@ -20,7 +20,6 @@ describe Gitlab::TaskHelpers do it 'checkout the version and reset to it' do expect(subject).to receive(:checkout_version).with(tag, clone_path) - expect(subject).to receive(:reset_to_version).with(tag, clone_path) subject.checkout_or_clone_version(version: version, repo: repo, target_dir: clone_path) end @@ -31,7 +30,6 @@ describe Gitlab::TaskHelpers do it 'checkout the version and reset to it with a branch name' do expect(subject).to receive(:checkout_version).with(branch, clone_path) - expect(subject).to receive(:reset_to_version).with(branch, clone_path) subject.checkout_or_clone_version(version: version, repo: repo, target_dir: clone_path) end @@ -70,20 +68,11 @@ describe Gitlab::TaskHelpers do describe '#checkout_version' do it 'clones the repo in the target dir' do expect(subject) - .to receive(:run_command!).with(%W[#{Gitlab.config.git.bin_path} -C #{clone_path} fetch --quiet]) + .to receive(:run_command!).with(%W[#{Gitlab.config.git.bin_path} -C #{clone_path} fetch --quiet origin #{tag}]) expect(subject) - .to receive(:run_command!).with(%W[#{Gitlab.config.git.bin_path} -C #{clone_path} checkout --quiet #{tag}]) + .to receive(:run_command!).with(%W[#{Gitlab.config.git.bin_path} -C #{clone_path} checkout -f --quiet FETCH_HEAD --]) subject.checkout_version(tag, clone_path) end end - - describe '#reset_to_version' do - it 'resets --hard to the given version' do - expect(subject) - .to receive(:run_command!).with(%W[#{Gitlab.config.git.bin_path} -C #{clone_path} reset --hard #{tag}]) - - subject.reset_to_version(tag, clone_path) - end - end end |