summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorMinsik Yoon <yms9654@gmail.com>2015-11-30 18:30:44 +0900
committerMinsik Yoon <yms9654@gmail.com>2015-12-01 09:51:10 +0900
commit8c4a3c77d87e89bf3fd237fef49fc87fb6170d86 (patch)
tree51bb96b58e513daf35052db83650652dc3ac3b01 /spec/controllers
parentd73d2a5e5851dd97223705272f05a1e2a87ffb5d (diff)
downloadgitlab-ce-8c4a3c77d87e89bf3fd237fef49fc87fb6170d86.tar.gz
Add ignore whitespace change option to commit view
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/commit_controller_spec.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/spec/controllers/commit_controller_spec.rb b/spec/controllers/commit_controller_spec.rb
index bb3d87f3840..5337a69e84b 100644
--- a/spec/controllers/commit_controller_spec.rb
+++ b/spec/controllers/commit_controller_spec.rb
@@ -69,6 +69,21 @@ describe Projects::CommitController do
expect(response.body).to start_with("diff --git")
end
+
+ it "should really only be a git diff without whitespace changes" do
+ get(:show,
+ namespace_id: project.namespace.to_param,
+ project_id: project.to_param,
+ id: '66eceea0db202bb39c4e445e8ca28689645366c5',
+ # id: commit.id,
+ format: format,
+ w: 1)
+
+ expect(response.body).to start_with("diff --git")
+ # without whitespace option, there are more than 2 diff_splits
+ diff_splits = assigns(:diffs)[0].diff.split("\n")
+ expect(diff_splits.length).to be <= 2
+ end
end
describe "as patch" do