kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2014-09-01 16:20:10 +03:00
commit 4102eb3b85
3 changed files with 66 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/milestones/show.html.haml
View file

@ -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}%;"}

30
features/project/issues/issues.feature
View file

@ -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.

34
features/steps/project/issues.rb
View file

@ -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