diff options
author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-10-03 13:11:16 +0100 |
---|---|---|
committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-10-11 16:33:06 +0100 |
commit | c90483406ecc2717076391737ff57167b5a03393 (patch) | |
tree | e63d729dc90a5b92f33df208c3aaa49058b7c780 /spec/models/commit_spec.rb | |
parent | ff076d88df70a70f6534faefefdca92b059318bf (diff) | |
download | gitlab-ce-c90483406ecc2717076391737ff57167b5a03393.tar.gz |
refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-merged
Diffstat (limited to 'spec/models/commit_spec.rb')
-rw-r--r-- | spec/models/commit_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb index d3e6a6648cc..51be3f36135 100644 --- a/spec/models/commit_spec.rb +++ b/spec/models/commit_spec.rb @@ -164,10 +164,10 @@ eos 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[:message]).to include('adds bar folder and branch-test text file to check Repository merged_to_root_ref method') } + it { expect(data[:timestamp]).to eq('2016-09-27T14:37:46+00:00') } + it { expect(data[:added]).to eq(["bar/branch-test.txt"]) } + it { expect(data[:modified]).to eq([]) } it { expect(data[:removed]).to eq([]) } end |