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 +++++++ 1 file changed, 7 insertions(+) (limited to 'features/project') 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 -- cgit v1.2.1