From 890b9f3a2dd90d68009943d9067ee7f76b4590f4 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 3 Apr 2013 22:04:26 +0300 Subject: [PATCH] Fix MR comment tests --- features/steps/project/project_merge_requests.rb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb index 4c22119b0..77f45338b 100644 --- a/features/steps/project/project_merge_requests.rb +++ b/features/steps/project/project_merge_requests.rb @@ -116,29 +116,21 @@ class ProjectMergeRequests < Spinach::FeatureSteps end Then 'I should see a discussion has started on line 185' do - first_commit = merge_request.commits.first - first_diff = first_commit.diffs.first page.should have_content "#{current_user.name} started a discussion on this merge request diff" - page.should have_content "#{first_diff.b_path}:L185" + page.should have_content "app/assets/stylesheets/tree.scss:L185" page.should have_content "Line is wrong" end Then 'I should see a discussion has started on commit bcf03b5de6c:L185' do - first_commit = merge_request.commits.first - first_diff = first_commit.diffs.first page.should have_content "#{current_user.name} started a discussion on commit" - page.should have_content first_commit.short_id(8) - page.should have_content "#{first_diff.b_path}:L185" + page.should have_content "app/assets/stylesheets/tree.scss:L185" page.should have_content "Line is wrong" end Then 'I should see a discussion has started on commit bcf03b5de6c' do - first_commit = merge_request.st_commits.first - first_diff = first_commit.diffs.first page.should have_content "#{current_user.name} started a discussion on commit bcf03b5de6c" - page.should have_content first_commit.short_id(8) page.should have_content "One comment to rule them all" - page.should have_content "#{first_diff.b_path}:L185" + page.should have_content "app/assets/stylesheets/tree.scss:L185" end def project -- 2.11.0