summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-25 11:40:33 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-25 11:40:33 +0300
commit674cbe1534442f2149a3b787a24b5db3cb581d55 (patch)
tree1e2b0c0767e8ffddba8831c634fa1d57d8f9c1d0 /features
parent907548a0fbf3c048536c2012bdbdbd10b604c067 (diff)
downloadgitlab-ce-674cbe1534442f2149a3b787a24b5db3cb581d55.tar.gz
Fix diff comments toggle button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index c98f160ad2e..b0a6e530e8a 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -131,8 +131,8 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I should see a discussion has started on line 185' do
- page.should have_content "#{current_user.name} started a discussion on this merge request diff"
- page.should have_content "app/assets/stylesheets/tree.scss:L185"
+ page.should have_content "#{current_user.name} started a discussion"
+ page.should have_content "app/assets/stylesheets/tree.scss"
page.should have_content "Line is wrong"
end
@@ -257,9 +257,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
click_button "Add Comment"
end
- within ".note-text" do
- page.should have_content message
- end
+ page.should have_content message
end
def init_diff_note_first_file