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
path: root/spec
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-29 17:22:27 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-03-29 17:22:27 +0300
commit76a15db45f4911542241ae62fe871101f1f79a78 (patch)
tree2efd748979eb1c15ae5f23fa9532345fbe4b95b9 /spec
parent412c9e8b9510608dcd9975997f5fb9f6efebb515 (diff)
parent1cc9bf869f599dafaad6705b19becab3bbd04ad8 (diff)
Merge branch '29832-fix-transient-failure' into 'master'
Make ChatNames::FindUserService stable by not checking a precise time Closes #29832 See merge request !10306
Diffstat (limited to 'spec')
-rw-r--r--spec/services/chat_names/find_user_service_spec.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/services/chat_names/find_user_service_spec.rb b/spec/services/chat_names/find_user_service_spec.rb
index 51441e8f3be..0dc96521fa8 100644
--- a/spec/services/chat_names/find_user_service_spec.rb
+++ b/spec/services/chat_names/find_user_service_spec.rb
@@ -18,9 +18,16 @@ describe ChatNames::FindUserService, services: true do
end
it 'updates when last time chat name was used' do
+ expect(chat_name.last_used_at).to be_nil
+
subject
- expect(chat_name.reload.last_used_at).to be_like_time(Time.now)
+ initial_last_used = chat_name.reload.last_used_at
+ expect(initial_last_used).to be_present
+
+ Timecop.travel(2.days.from_now) { described_class.new(service, params).execute }
+
+ expect(chat_name.reload.last_used_at).to be > initial_last_used
end
end