From ca1526e7ffa2b1eeccae187406987de0250c2012 Mon Sep 17 00:00:00 2001 From: Sytse Sijbrandij Date: Wed, 27 Nov 2013 09:00:14 +0100 Subject: Conventional naming for diff modes. --- features/project/commits/commits.feature | 8 ++++---- features/steps/project/project_browse_commits.rb | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'features') diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature index 97113871a0a..cbe8b321507 100644 --- a/features/project/commits/commits.feature +++ b/features/project/commits/commits.feature @@ -14,12 +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 + And I see side-by-side diff button - Scenario: I browse commit with parallel diff view + Scenario: I browse commit with side-by-side diff view Given I click on commit link - And I click parallel diff button - Then I see unified diff button + And I click side-by-side diff button + Then I see inline 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 17c51dc9a96..0376c892696 100644 --- a/features/steps/project/project_browse_commits.rb +++ b/features/steps/project/project_browse_commits.rb @@ -89,16 +89,16 @@ class ProjectBrowseCommits < Spinach::FeatureSteps links[1]['href'].should =~ %r{blob/cc1ba255d6c5ffdce87a357ba7ccc397a4f4026b} end - Given 'I click parallel diff button' do - click_link "Parallel Diff" + Given 'I click side-by-side diff button' do + click_link "side-by-side Diff" end - Then 'I see parallel diff button' do - page.should have_content "Parallel Diff" + Then 'I see side-by-side diff button' do + page.should have_content "Side-by-side Diff" end - Then 'I see unified diff button' do - page.should have_content "Unified Diff" + Then 'I see inline diff button' do + page.should have_content "Inline Diff" end end -- cgit v1.2.1