diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-24 14:00:23 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-24 14:00:23 +0200 |
commit | 353d426e4e68006ba8cea90e2f6ad4e8956cb6a9 (patch) | |
tree | 280f42e1f77712113a7453ed74d3bc8b9ec068f6 /features | |
parent | 3e866b2aa6d95008894910342d4cbedc8308ef2a (diff) | |
download | gitlab-ce-353d426e4e68006ba8cea90e2f6ad4e8956cb6a9.tar.gz |
Show CI status on Your projects page and Starred projects pageci-status-projects-page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r-- | features/dashboard/dashboard.feature | 4 | ||||
-rw-r--r-- | features/steps/dashboard/dashboard.rb | 4 | ||||
-rw-r--r-- | features/steps/project/graph.rb | 4 | ||||
-rw-r--r-- | features/steps/shared/project.rb | 10 |
4 files changed, 17 insertions, 5 deletions
diff --git a/features/dashboard/dashboard.feature b/features/dashboard/dashboard.feature index 392d4235eff..b667b587c5b 100644 --- a/features/dashboard/dashboard.feature +++ b/features/dashboard/dashboard.feature @@ -4,12 +4,14 @@ Feature: Dashboard Given I sign in as a user And I own project "Shop" And project "Shop" has push event + And project "Shop" has CI enabled + And project "Shop" has CI build And I visit dashboard page - @javascript Scenario: I should see projects list Then I should see "New Project" link Then I should see "Shop" project link + Then I should see "Shop" project CI status @javascript Scenario: I should see activity list 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 |