From 6f32ccf432c8c3c634dbacd3fc3a28d1c59d01e0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 13 Dec 2011 23:24:31 +0200 Subject: merge_requests restyle with forms --- spec/requests/merge_requests_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec') diff --git a/spec/requests/merge_requests_spec.rb b/spec/requests/merge_requests_spec.rb index bdbc890912e..18c85df4234 100644 --- a/spec/requests/merge_requests_spec.rb +++ b/spec/requests/merge_requests_spec.rb @@ -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 -- cgit v1.2.1