deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge_requests restyle with forms

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-12-13 23:24:31 +02:00
parent 3a50b6cac9
commit 6f32ccf432
6 changed files with 130 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec/requests/merge_requests_spec.rb
View file

@ -42,8 +42,8 @@ describe "MergeRequests" do
it { should have_content(@merge_request.title) }
it "Show page should inform user that merge request closed" do
within ".merge-request-show-holder h3" do
page.should have_content "Closed"
within ".merge-tabs" do
page.should have_content "Reopen"
end
end
end
@ -62,7 +62,7 @@ describe "MergeRequests" do
it { current_path.should == project_merge_request_path(project, project.merge_requests.last) }
it "should create merge request" do
page.should have_content "Open"
page.should have_content "Close"
page.should have_content @user.name
end
end