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