Download as
Browse Code »

Commit 6074896cbfc7f8649e8f7feec1e88de76c2bfbc0

Authored by Andrew8xx8
1 parent 69698aac
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Spinach tests fixed

Showing 3 changed files with 7 additions and 9 deletions   Show diff stats
app/views/milestones/_milestone.html.haml
  Diff comments   View file @6074896
1 %li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone) } 1 %li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone) }
2 .pull-right 2 .pull-right
3 - - if can?(current_user, :admin_milestone, milestone.project) and milestone.opened? 3 + - if can?(current_user, :admin_milestone, milestone.project) and milestone.active?
4 = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do 4 = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
5 %i.icon-edit 5 %i.icon-edit
6 Edit 6 Edit
features/steps/project/project_issues.rb
  Diff comments   View file @6074896
@@ -122,10 +122,9 @@ class ProjectIssues < Spinach::FeatureSteps @@ -122,10 +122,9 @@ class ProjectIssues < Spinach::FeatureSteps
122 122
123 And 'project "Shop" have "Release 0.3" closed issue' do 123 And 'project "Shop" have "Release 0.3" closed issue' do
124 project = Project.find_by_name("Shop") 124 project = Project.find_by_name("Shop")
125 - create(:issue, 125 + create(:closed_issue,
126 :title => "Release 0.3", 126 :title => "Release 0.3",
127 :project => project, 127 :project => project,
128 - :author => project.users.first,  
129 - :closed => true) 128 + :author => project.users.first)
130 end 129 end
131 end 130 end
features/steps/project/project_merge_requests.rb
  Diff comments   View file @6074896
@@ -26,7 +26,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps @@ -26,7 +26,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
26 26
27 Then 'I should see closed merge request "Bug NS-04"' do 27 Then 'I should see closed merge request "Bug NS-04"' do
28 mr = MergeRequest.find_by_title("Bug NS-04") 28 mr = MergeRequest.find_by_title("Bug NS-04")
29 - mr.closed.should be_true 29 + mr.closed?.should be_true
30 page.should have_content "Closed by" 30 page.should have_content "Closed by"
31 end 31 end
32 32
@@ -64,7 +64,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps @@ -64,7 +64,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
64 64
65 And 'project "Shop" have "Bug NS-04" open merge request' do 65 And 'project "Shop" have "Bug NS-04" open merge request' do
66 project = Project.find_by_name("Shop") 66 project = Project.find_by_name("Shop")
67 - create(:merge_request, 67 + create(:closed_merge_request,
68 title: "Bug NS-04", 68 title: "Bug NS-04",
69 project: project, 69 project: project,
70 author: project.users.first) 70 author: project.users.first)
@@ -80,11 +80,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps @@ -80,11 +80,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps
80 80
81 And 'project "Shop" have "Feature NS-03" closed merge request' do 81 And 'project "Shop" have "Feature NS-03" closed merge request' do
82 project = Project.find_by_name("Shop") 82 project = Project.find_by_name("Shop")
83 - create(:merge_request, 83 + create(:closed_merge_request,
84 title: "Feature NS-03", 84 title: "Feature NS-03",
85 project: project, 85 project: project,
86 - author: project.users.first,  
87 - closed: true) 86 + author: project.users.first)
88 end 87 end
89 88
90 And 'I switch to the diff tab' do 89 And 'I switch to the diff tab' do