summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-02 10:08:16 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-02 10:08:16 +0200
commit5de0b078442da2adc2b0673e3286c7d1a7cb2501 (patch)
treeee259245c0a05bc4ddcf9ae3f38a3d897e038cdb /features
parente3bc0e210451494ad5290755a79a510ea5c9a18b (diff)
downloadgitlab-ce-5de0b078442da2adc2b0673e3286c7d1a7cb2501.tar.gz
Prevent creating 2 Ci::Project entities when enable CI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/commits/commits.rb2
-rw-r--r--features/steps/shared/project.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index 47f58091b93..5ebc3a49760 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -103,7 +103,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
end
step 'commit has ci status' do
- @project.enable_ci(@user)
+ @project.enable_ci
create :ci_commit, gl_project: @project, sha: sample_commit.id
end
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index fc51cec150e..5744e455ebd 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -199,7 +199,7 @@ module SharedProject
step 'project "Shop" has CI enabled' do
project = Project.find_by(name: "Shop")
- project.enable_ci(@user)
+ project.enable_ci
end
step 'project "Shop" has CI build' do