diff options
| author | Andrew8xx8 <avk@8xx8.ru> | 2013-02-18 14:43:08 +0400 |
|---|---|---|
| committer | Andrew8xx8 <avk@8xx8.ru> | 2013-02-18 14:43:50 +0400 |
| commit | 6074896cbfc7f8649e8f7feec1e88de76c2bfbc0 (patch) | |
| tree | 33e541a8dac5a175463e3e3ffe9b82956a1ab331 /features | |
| parent | 69698aacbc237f6b9cbabae8eef2b7438f505466 (diff) | |
| download | gitlab-ce-6074896cbfc7f8649e8f7feec1e88de76c2bfbc0.tar.gz | |
Spinach tests fixed
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/project_issues.rb | 5 | ||||
| -rw-r--r-- | features/steps/project/project_merge_requests.rb | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/features/steps/project/project_issues.rb b/features/steps/project/project_issues.rb index 2103aeb1715..7d54009988f 100644 --- a/features/steps/project/project_issues.rb +++ b/features/steps/project/project_issues.rb @@ -122,10 +122,9 @@ class ProjectIssues < Spinach::FeatureSteps And 'project "Shop" have "Release 0.3" closed issue' do project = Project.find_by_name("Shop") - create(:issue, + create(:closed_issue, :title => "Release 0.3", :project => project, - :author => project.users.first, - :closed => true) + :author => project.users.first) end end diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb index 329261add2a..534df2869f5 100644 --- a/features/steps/project/project_merge_requests.rb +++ b/features/steps/project/project_merge_requests.rb @@ -26,7 +26,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps Then 'I should see closed merge request "Bug NS-04"' do mr = MergeRequest.find_by_title("Bug NS-04") - mr.closed.should be_true + mr.closed?.should be_true page.should have_content "Closed by" end @@ -64,7 +64,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps And 'project "Shop" have "Bug NS-04" open merge request' do project = Project.find_by_name("Shop") - create(:merge_request, + create(:closed_merge_request, title: "Bug NS-04", project: project, author: project.users.first) @@ -80,11 +80,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps And 'project "Shop" have "Feature NS-03" closed merge request' do project = Project.find_by_name("Shop") - create(:merge_request, + create(:closed_merge_request, title: "Feature NS-03", project: project, - author: project.users.first, - closed: true) + author: project.users.first) end And 'I switch to the diff tab' do |