summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-12-10 17:44:06 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2015-12-11 18:02:09 +0100
commit64bfd9d71a4017e0b5336a2c1565926f4b8beedd (patch)
tree8b7770af4cf0e54db3ada26550af9cbda4eabbb0 /spec/features
parent8cdd54cc0696b76daa2baf463d02d944b50bac6a (diff)
downloadgitlab-ce-64bfd9d71a4017e0b5336a2c1565926f4b8beedd.tar.gz
Remove ci_ prefix from all ci related things
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/builds_spec.rb2
-rw-r--r--spec/features/runners_spec.rb10
-rw-r--r--spec/features/triggers_spec.rb6
-rw-r--r--spec/features/variables_spec.rb2
4 files changed, 10 insertions, 10 deletions
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index 61d81cb0c8e..f0031a0a247 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -37,7 +37,7 @@ describe "Builds" do
context "All builds" do
before do
- @project.ci_builds.running_or_pending.each(&:success)
+ @project.builds.running_or_pending.each(&:success)
visit namespace_project_builds_path(@project.namespace, @project, scope: :all)
end
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index a4562f2fae8..d97831aae14 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -21,9 +21,9 @@ describe "Runners" do
@specific_runner = FactoryGirl.create :ci_specific_runner
@specific_runner2 = FactoryGirl.create :ci_specific_runner
@specific_runner3 = FactoryGirl.create :ci_specific_runner
- @project.ci_runners << @specific_runner
- @project2.ci_runners << @specific_runner2
- @project3.ci_runners << @specific_runner3
+ @project.runners << @specific_runner
+ @project2.runners << @specific_runner2
+ @project3.runners << @specific_runner3
visit runners_path(@project)
end
@@ -48,7 +48,7 @@ describe "Runners" do
end
it "disables specific runner for project" do
- @project2.ci_runners << @specific_runner
+ @project2.runners << @specific_runner
visit runners_path(@project)
within ".activated-specific-runners" do
@@ -85,7 +85,7 @@ describe "Runners" do
@project = FactoryGirl.create :empty_project
@project.team << [user, :master]
@specific_runner = FactoryGirl.create :ci_specific_runner
- @project.ci_runners << @specific_runner
+ @project.runners << @specific_runner
end
it "shows runner information" do
diff --git a/spec/features/triggers_spec.rb b/spec/features/triggers_spec.rb
index b0705a45aee..3cbc8253ad6 100644
--- a/spec/features/triggers_spec.rb
+++ b/spec/features/triggers_spec.rb
@@ -13,16 +13,16 @@ describe 'Triggers' do
context 'create a trigger' do
before do
click_on 'Add Trigger'
- expect(@project.ci_triggers.count).to eq(1)
+ expect(@project.triggers.count).to eq(1)
end
it 'contains trigger token' do
- expect(page).to have_content(@project.ci_triggers.first.token)
+ expect(page).to have_content(@project.triggers.first.token)
end
it 'revokes the trigger' do
click_on 'Revoke'
- expect(@project.ci_triggers.count).to eq(0)
+ expect(@project.triggers.count).to eq(0)
end
end
end
diff --git a/spec/features/variables_spec.rb b/spec/features/variables_spec.rb
index a6e68eeefbc..afea1840cd7 100644
--- a/spec/features/variables_spec.rb
+++ b/spec/features/variables_spec.rb
@@ -18,7 +18,7 @@ describe "Variables" do
click_on "Save changes"
expect(page).to have_content("Variables were successfully updated.")
- expect(@project.ci_variables.count).to eq(1)
+ expect(@project.variables.count).to eq(1)
end
end
end