summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-19 09:38:01 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-19 09:38:01 +0200
commitee750298675f0beed94688a9798d3e0b8362b455 (patch)
tree052ed5fd500c9d5f78b074e90ecbaa5d6c0d50bc /features
parent83d35399d13fa46020b004f966d67fb527b8809c (diff)
downloadgitlab-ce-ee750298675f0beed94688a9798d3e0b8362b455.tar.gz
Move assignee/milestone below description of Issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/project_merge_requests.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb
index cc2648c6204..adf9e77e136 100644
--- a/features/steps/project/project_merge_requests.rb
+++ b/features/steps/project/project_merge_requests.rb
@@ -55,7 +55,9 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I click link "Close"' do
- click_link "Close"
+ within '.page-title' do
+ click_link "Close"
+ end
end
step 'I submit new merge request "Wiki Feature"' do
@@ -163,7 +165,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I should see merged request' do
- within '.page-title' do
+ within '.issue-box' do
page.should have_content "Merged"
end
end