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-08-25 09:35:26 +0300
committerStan Hu <stanhu@gmail.com>2015-08-25 09:35:26 +0300
commit3bee4a6712a654abeba4ce07eb17235c3240b487 (patch)
tree03d8fdf7c6df029fec4fe21a9a37998a7cb40056 /features
parent24b282aeeaf5ba41c6b73100051eb48428787770 (diff)
Fix "Reload with full diff" URL button in compare branch view
This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view.
Diffstat (limited to 'features')
-rw-r--r--features/project/commits/commits.feature1
-rw-r--r--features/steps/project/commits/commits.rb6
2 files changed, 7 insertions, 0 deletions
diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature
index c4b206edc95..3ebc8a39aae 100644
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
@@ -41,6 +41,7 @@ Feature: Project Commits
Scenario: I browse big commit
Given I visit big commit page
Then I see big commit warning
+ And I see "Reload with full diff" link
Scenario: I browse a commit with an image
Given I visit a commit with an image that changed
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index e6330ec457e..a8532cc18d8 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -79,6 +79,12 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
expect(page).to have_content "Too many changes"
end
+ step 'I see "Reload with full diff" link' do
+ link = find_link('Reload with full diff')
+ expect(link[:href]).to end_with('?force_show_diff=true')
+ expect(link[:href]).not_to include('.html')
+ end
+
step 'I visit a commit with an image that changed' do
visit namespace_project_commit_path(@project.namespace, @project, sample_image_commit.id)
end