Merge pull request #5308 from Popl7/parallel-diffs-side-by-side

diff view on commit with parallel diff view

2 files changed, 19 insertions, 0 deletions

diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature
index fe470f5ac99..97113871a0a 100644
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
@@ -14,6 +14,12 @@ Feature: Project Browse commits
   Scenario: I browse commit from list
     Given I click on commit link
     Then I see commit info
+    And I see parallel diff button
+
+  Scenario: I browse commit with parallel diff view
+    Given I click on commit link
+    And I click parallel diff button
+    Then I see unified diff button
 
   Scenario: I compare refs
     Given I visit compare refs page
diff --git a/features/steps/project/project_browse_commits.rb b/features/steps/project/project_browse_commits.rb
index 650bc3a16f7..17c51dc9a96 100644
--- a/features/steps/project/project_browse_commits.rb
+++ b/features/steps/project/project_browse_commits.rb
@@ -88,4 +88,17 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
     links[0]['href'].should =~ %r{blob/bc3735004cb45cec5e0e4fa92710897a910a5957}
     links[1]['href'].should =~ %r{blob/cc1ba255d6c5ffdce87a357ba7ccc397a4f4026b}
   end
+
+  Given 'I click parallel diff button' do
+    click_link "Parallel Diff"
+  end
+
+  Then 'I see parallel diff button' do
+    page.should have_content "Parallel Diff"
+  end
+
+  Then 'I see unified diff button' do
+    page.should have_content "Unified Diff"
+  end
+
 end