diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-02-03 13:17:03 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-02-03 13:17:03 -0600 |
| commit | 04dc2b76d7e382a6b6369576753cfc20928c99b8 (patch) | |
| tree | b9062e9886f1913a634e505755e284d7073f2eaa /features/steps/project/graph.rb | |
| parent | 152b292d0b566547875a44470c76e9a43cb28a36 (diff) | |
| parent | 538a6875d3b53f909e9b5b6ef396a457cbcae760 (diff) | |
| download | gitlab-ce-04dc2b76d7e382a6b6369576753cfc20928c99b8.tar.gz | |
Merge branch 'master' into go-go-gadget-webpack
* master: (181 commits)
Fixed adding to list bug
Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index
Fixed modal lists dropdown not updating when list is deleted
Fixed remove btn error after creating new issue in list
Removed duplicated test
Removed Masonry, instead uses groups of data
Uses mixins for repeated functions
Fixed up specs
Props use objects with required & type values
Removes labels instead of closing issue when clicking remove button
Fixed JS lint errors
Fixed issue card spec
Added webkit CSS properties
Fixed bug with empty state showing after search Fixed users href path being incorrect
Fixed bug where 2 un-selected issues would stay on selected tab
Fixed DB schema Changed how components are added in objects
Added remove button
Add optional id property to the issue schema
Fixed issue link href
Disabled add issues button if no lists exist
...
Diffstat (limited to 'features/steps/project/graph.rb')
| -rw-r--r-- | features/steps/project/graph.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/project/graph.rb b/features/steps/project/graph.rb index 7490d2bc6e7..48ac7a98f0d 100644 --- a/features/steps/project/graph.rb +++ b/features/steps/project/graph.rb @@ -34,9 +34,9 @@ class Spinach::Features::ProjectGraph < Spinach::FeatureSteps step 'page should have CI graphs' do expect(page).to have_content 'Overall' - expect(page).to have_content 'Builds for last week' - expect(page).to have_content 'Builds for last month' - expect(page).to have_content 'Builds for last year' + expect(page).to have_content 'Jobs for last week' + expect(page).to have_content 'Jobs for last month' + expect(page).to have_content 'Jobs for last year' expect(page).to have_content 'Commit duration in minutes for last 30 commits' end |