diff options
| author | Steven Thonus <github@popl.nl> | 2013-10-10 00:22:37 +0400 |
|---|---|---|
| committer | Steven Thonus <steven@ln2.nl> | 2013-11-17 19:35:34 +0400 |
| commit | 856d4088fbc7da5b5b583acc11ab674c4452b402 (patch) | |
| tree | 5c15bbfdec71d7830a40887b9440a1e0a24a9b55 /features | |
| parent | c938833bd9f5373af5b8012df39a360517fd5261 (diff) | |
diff view on commit with parallel diff view
TODO: fix comment forms to respect left and right columns
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 |