diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-01 17:20:10 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-01 17:20:10 +0400 |
commit | 4102eb3b85a1a9d43bebe116066719e6b0872566 (patch) | |
tree | 1a290f1a67567c8637d0ccf41c78758f8b3fbe38 | |
parent | 83a588c31641597f68a76acbef27e2f2a68a8ae7 (diff) | |
parent | 31773f4dd7f89df7cea3ef4b3f547b479329ef9e (diff) |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
-rw-r--r-- | app/views/projects/milestones/show.html.haml | 2 | ||||
-rw-r--r-- | features/project/issues/issues.feature | 30 | ||||
-rw-r--r-- | features/steps/project/issues.rb | 34 |
3 files changed, 66 insertions, 0 deletions
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 42c3f45f6c9..1a495aa1c40 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -47,6 +47,8 @@ #{@milestone.closed_items_count} closed – #{@milestone.open_items_count} open + + %span.light #{@milestone.percent_complete}% complete %span.pull-right= @milestone.expires_at .progress.progress-info .progress-bar{style: "width: #{@milestone.percent_complete}%;"} diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature index b2e6f1f9324..e3001318c23 100644 --- a/features/project/issues/issues.feature +++ b/features/project/issues/issues.feature @@ -63,6 +63,36 @@ Feature: Project Issues Then I should see "Release 0.3" in issues And I should not see "Release 0.4" in issues + @javascript + Scenario: Search issues when search string exactly matches issue description + Given project 'Shop' has issue 'Bugfix1' with description: 'Description for issue1' + And I fill in issue search with 'Description for issue1' + Then I should see 'Bugfix1' in issues + And I should not see "Release 0.4" in issues + And I should not see "Release 0.3" in issues + And I should not see "Tweet control" in issues + + @javascript + Scenario: Search issues when search string partially matches issue description + Given project 'Shop' has issue 'Bugfix1' with description: 'Description for issue1' + And project 'Shop' has issue 'Feature1' with description: 'Feature submitted for issue1' + And I fill in issue search with 'issue1' + Then I should see 'Feature1' in issues + Then I should see 'Bugfix1' in issues + And I should not see "Release 0.4" in issues + And I should not see "Release 0.3" in issues + And I should not see "Tweet control" in issues + + @javascript + Scenario: Search issues when search string matches no issue description + Given project 'Shop' has issue 'Bugfix1' with description: 'Description for issue1' + And I fill in issue search with 'Rock and roll' + Then I should not see 'Bugfix1' in issues + And I should not see "Release 0.4" in issues + And I should not see "Release 0.3" in issues + And I should not see "Tweet control" in issues + + # Markdown Scenario: Headers inside the description should have ids generated for them. diff --git a/features/steps/project/issues.rb b/features/steps/project/issues.rb index 557ea2fdca8..ab2d7cee2e3 100644 --- a/features/steps/project/issues.rb +++ b/features/steps/project/issues.rb @@ -187,4 +187,38 @@ class ProjectIssues < Spinach::FeatureSteps step 'The code block should be unchanged' do page.should have_content("```\nCommand [1]: /usr/local/bin/git , see [text](doc/text)\n```") end + + step 'project \'Shop\' has issue \'Bugfix1\' with description: \'Description for issue1\'' do + project = Project.find_by(name: 'Shop') + issue = create(:issue, title: 'Bugfix1', description: 'Description for issue1', project: project) + end + + step 'project \'Shop\' has issue \'Feature1\' with description: \'Feature submitted for issue1\'' do + project = Project.find_by(name: 'Shop') + issue = create(:issue, title: 'Feature1', description: 'Feature submitted for issue1', project: project) + end + + step 'I fill in issue search with \'Description for issue1\'' do + fill_in 'issue_search', with: 'Description for issue' + end + + step 'I fill in issue search with \'issue1\'' do + fill_in 'issue_search', with: 'issue1' + end + + step 'I fill in issue search with \'Rock and roll\'' do + fill_in 'issue_search', with: 'Description for issue' + end + + step 'I should see \'Bugfix1\' in issues' do + page.should have_content 'Bugfix1' + end + + step 'I should see \'Feature1\' in issues' do + page.should have_content 'Feature1' + end + + step 'I should not see \'Bugfix1\' in issues' do + page.should_not have_content 'Bugfix1' + end end |