Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-03-24 10:07:17 +0300
committerStan Hu <stanhu@gmail.com>2015-03-24 10:19:41 +0300
commiteecd897170c7f6428ba500610f368a1f3bdcbb8f (patch)
tree5bcae63b46811603c0fb28c0a4e1f8fc96ca30c7 /features
parentc3c9703437a552700c2a6ca010b05cc56aa6d73a (diff)
Fix code unfold not working on Compare commits page
Closes #1274
Diffstat (limited to 'features')
-rw-r--r--features/project/commits/commits.feature3
-rw-r--r--features/steps/project/commits/commits.rb12
2 files changed, 15 insertions, 0 deletions
diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature
index 46076b6f3e6..c4b206edc95 100644
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
@@ -21,10 +21,13 @@ Feature: Project Commits
And I click side-by-side diff button
Then I see inline diff button
+ @javascript
Scenario: I compare refs
Given I visit compare refs page
And I fill compare fields with refs
Then I see compared refs
+ And I unfold diff
+ Then I should see additional file lines
Scenario: I browse commits for a specific path
Given I visit my project's commits page for a specific path
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index b2dccf868b0..57b727f837e 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -38,6 +38,18 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
click_button "Compare"
end
+ step 'I unfold diff' do
+ @diff = first('.js-unfold')
+ @diff.click
+ sleep 2
+ end
+
+ step 'I should see additional file lines' do
+ within @diff.parent do
+ first('.new_line').text.should_not have_content "..."
+ end
+ end
+
step 'I see compared refs' do
page.should have_content "Compare View"
page.should have_content "Commits (1)"