summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-05-04 16:07:13 +0000
committerRémy Coutable <remy@rymai.me>2016-05-04 16:07:13 +0000
commit1a9d50597262a31f03dc66584f05d66b905d9d59 (patch)
tree2599b4983b22fb9e617a80d9205e4401a6e1aee7 /features
parentc2c70cfcb31f67809d8dfb5f470e0dc1eefe15d9 (diff)
parent209f2f1e6fd861dd7bb6a73389400b4bb266d26d (diff)
downloadgitlab-ce-1a9d50597262a31f03dc66584f05d66b905d9d59.tar.gz
Merge branch 'use-rugged-to-create-tag' into 'master'
Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/commits/tags.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/commits/tags.rb b/features/steps/project/commits/tags.rb
index eff4234a44a..912ba580efd 100644
--- a/features/steps/project/commits/tags.rb
+++ b/features/steps/project/commits/tags.rb
@@ -57,11 +57,11 @@ class Spinach::Features::ProjectCommitsTags < Spinach::FeatureSteps
end
step 'I should see new an error that tag ref is invalid' do
- expect(page).to have_content 'Invalid reference name'
+ expect(page).to have_content 'Target foo is invalid'
end
step 'I should see new an error that tag already exists' do
- expect(page).to have_content 'Tag already exists'
+ expect(page).to have_content 'Tag v1.0.0 already exists'
end
step "I visit tag 'v1.1.0' page" do