From 546dab6da9b157efcd2e45c38b94eb118919fa4f Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 25 Mar 2015 23:39:34 -0700 Subject: Fix broken side-by-side diff view on merge request page Closes #1294 --- features/project/merge_requests.feature | 7 +++++++ features/steps/project/merge_requests.rb | 14 ++++++++++++++ 2 files changed, 21 insertions(+) (limited to 'features') diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 91dc576f8b4..cbb5c8eb39b 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -166,6 +166,13 @@ Feature: Project Merge Requests And I click Side-by-side Diff tab Then I should see comments on the side-by-side diff page + @javascript + Scenario: I view diffs on a merge request + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And I visit merge request page "Bug NS-05" + And I click on the Changes tab via Javascript + Then I should see the proper Inline and Side-by-side links + # Task status in issues list Scenario: Merge requests list should display task status diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 6f6ce439f3e..40c102833a4 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -117,6 +117,20 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request) end + step 'I click on the Changes tab via Javascript' do + find('.diffs-tab').click + sleep 2 + end + + step 'I should see the proper Inline and Side-by-side links' do + buttons = all('#commit-diff-viewtype') + expect(buttons.count).to eq(2) + + buttons.each do |b| + expect(b['href']).should_not have_content('json') + end + end + step 'I switch to the merge request\'s comments tab' do visit namespace_project_merge_request_path(project.namespace, project, merge_request) end -- cgit v1.2.1