diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-26 03:31:42 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-26 03:31:42 -0800 |
commit | b51c2c81189c291c2af0fcd07a409731dbcb91ed (patch) | |
tree | 63a94dc7cec708dd5183842a9cd30e4b8b4b41ee /features | |
parent | c57180367c8a9e55beb378fc7d0fd3c1cc1497e5 (diff) | |
parent | 856d4088fbc7da5b5b583acc11ab674c4452b402 (diff) | |
download | gitlab-ce-b51c2c81189c291c2af0fcd07a409731dbcb91ed.tar.gz |
Merge pull request #5308 from Popl7/parallel-diffs-side-by-side
diff view on commit with parallel diff view
Diffstat (limited to 'features')
-rw-r--r-- | features/project/commits/commits.feature | 6 | ||||
-rw-r--r-- | features/steps/project/project_browse_commits.rb | 13 |
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 |