diff options
author | skv <skv-headless@yandex.ru> | 2014-08-02 19:12:01 +0400 |
---|---|---|
committer | skv <skv-headless@yandex.ru> | 2014-08-14 15:48:14 +0400 |
commit | 4e4080016604e2c7ca9a5e75d6dd37d34b99cb09 (patch) | |
tree | 1a443fc6b7a16828c8a4b92d1724c2f72a4024f4 /features | |
parent | fdd8e4507527badd875a40a0ab8a3ed47a03c764 (diff) | |
download | gitlab-ce-4e4080016604e2c7ca9a5e75d6dd37d34b99cb09.tar.gz |
diff unfold
Diffstat (limited to 'features')
-rw-r--r-- | features/project/merge_requests.feature | 8 | ||||
-rw-r--r-- | features/steps/project/merge_requests.rb | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index d4c71ba336e..8b6c296dfe6 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -139,3 +139,11 @@ Feature: Project Merge Requests And I click link "Show inline discussion" of the second file Then I should see a comment like "Line is wrong" in the second file And I should still see a comment like "Line is correct" in the first file + + @javascript + Scenario: I unfold diff + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And I visit merge request page "Bug NS-05" + And I switch to the diff tab + And I unfold diff + Then I should see additional file lines diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index f0007a039e4..05d3e5067c5 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -242,6 +242,14 @@ class ProjectMergeRequests < Spinach::FeatureSteps end end + step 'I unfold diff' do + first('.js-unfold').click + end + + step 'I should see additional file lines' do + expect(first('.text-file')).to have_content('.bundle') + end + def project @project ||= Project.find_by!(name: "Shop") end |