summaryrefslogtreecommitdiff
path: root/features/steps
diff options
context:
space:
mode:
Diffstat (limited to 'features/steps')
-rw-r--r--features/steps/dashboard/dashboard.rb4
-rw-r--r--features/steps/project/graph.rb4
-rw-r--r--features/steps/shared/project.rb10
3 files changed, 14 insertions, 4 deletions
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index cb3a80cac29..f0fbd8a826a 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -11,6 +11,10 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
expect(page).to have_link "Shop"
end
+ step 'I should see "Shop" project CI status' do
+ expect(page).to have_link "Build status: skipped"
+ end
+
step 'I should see last push widget' do
expect(page).to have_content "You pushed to fix"
expect(page).to have_link "Create Merge Request"
diff --git a/features/steps/project/graph.rb b/features/steps/project/graph.rb
index 9f9d099961d..9453d636445 100644
--- a/features/steps/project/graph.rb
+++ b/features/steps/project/graph.rb
@@ -23,10 +23,6 @@ class Spinach::Features::ProjectGraph < Spinach::FeatureSteps
visit ci_namespace_project_graph_path(project.namespace, project, 'master')
end
- step 'project "Shop" has CI enabled' do
- project.enable_ci(@user)
- end
-
step 'page should have CI graphs' do
expect(page).to have_content 'Overall'
expect(page).to have_content 'Builds chart for last week'
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index a9cf426852e..fa841f67510 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -196,4 +196,14 @@ module SharedProject
create(:label, project: project, title: 'feature')
create(:label, project: project, title: 'enhancement')
end
+
+ step 'project "Shop" has CI enabled' do
+ project = Project.find_by(name: "Shop")
+ project.enable_ci(@user)
+ end
+
+ step 'project "Shop" has CI build' do
+ project = Project.find_by(name: "Shop")
+ create :ci_commit, project: project.gitlab_ci_project, sha: project.commit.sha
+ end
end