diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-06-23 17:52:51 -0400 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-07-18 16:20:27 -0400 |
commit | 25b01b4c8594e8260dd1c86523bb9989aefd1fda (patch) | |
tree | f9207e8b90233d1014573860594dcb6a62c10a5f /spec/services/git_push_service_spec.rb | |
parent | 90f8feae46ca49299dbe138a229a51c5294f88be (diff) | |
download | gitlab-ce-25b01b4c8594e8260dd1c86523bb9989aefd1fda.tar.gz |
Incorporate Gitaly's Commits#between RPC
Diffstat (limited to 'spec/services/git_push_service_spec.rb')
-rw-r--r-- | spec/services/git_push_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb index 3f77ed10069..c493c08a7ae 100644 --- a/spec/services/git_push_service_spec.rb +++ b/spec/services/git_push_service_spec.rb @@ -108,7 +108,7 @@ describe GitPushService, services: true do it { is_expected.to include(id: @commit.id) } it { is_expected.to include(message: @commit.safe_message) } - it { is_expected.to include(timestamp: @commit.date.xmlschema) } + it { expect(subject[:timestamp].in_time_zone).to eq(@commit.date.in_time_zone) } it do is_expected.to include( url: [ @@ -163,7 +163,7 @@ describe GitPushService, services: true do execute_service(project, user, @blankrev, 'newrev', 'refs/heads/master' ) end end - + context "Sends System Push data" do it "when pushing on a branch" do expect(SystemHookPushWorker).to receive(:perform_async).with(@push_data, :push_hooks) |