summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-12-07 14:43:13 +0000
committerValery Sizov <valery@gitlab.com>2015-12-07 14:43:13 +0000
commitbd5fb1b479f29df3c2150b6c375c1b7bffd28931 (patch)
tree6786dc0077d83a639753723a1ae1fadb0dfba257 /spec/models
parente88fd58671f5407d80fafe1070d48b750b9f2e50 (diff)
parent3c97cbc74cf87856ed7b1af197358d4e3adb1240 (diff)
downloadgitlab-ce-bd5fb1b479f29df3c2150b6c375c1b7bffd28931.tar.gz
Merge branch 'webhook_payload_with_changes' into 'master'
Add added, modified and removed properties to commit object in webhook https://gitlab.com/gitlab-org/gitlab-ee/issues/20 See merge request !1988
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/commit_spec.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 974b52c1833..38a3dc1f4a6 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -107,4 +107,15 @@ eos
# Include the subject in the repository stub.
let(:extra_commits) { [subject] }
end
+
+ describe '#hook_attrs' do
+ let(:data) { commit.hook_attrs(with_changed_files: true) }
+
+ it { expect(data).to be_a(Hash) }
+ it { expect(data[:message]).to include('Add submodule from gitlab.com') }
+ it { expect(data[:timestamp]).to eq('2014-02-27T11:01:38+02:00') }
+ it { expect(data[:added]).to eq(["gitlab-grack"]) }
+ it { expect(data[:modified]).to eq([".gitmodules"]) }
+ it { expect(data[:removed]).to eq([]) }
+ end
end