Skip to content

Fix broken ee geo specs

Thong Kuah requested to merge fix_geo_cache_specs into master

What does this MR do?

Fixes broken master spec ee/spec/lib/gitlab/geo_spec.rb:11 (https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/238135849)

@@ -1,2 +1,2 @@
-["geo:current_node:5.1.7", "an instance of String", {:expires_in=>15 seconds}]
+["geo:current_node:12.1.0-pre:5.1.7", "null", {:expires_in=>15 seconds}]


RSpec::Retry: 2nd try ./ee/spec/lib/gitlab/geo_spec.rb:11

2nd Try error in ./ee/spec/lib/gitlab/geo_spec.rb:11:

Arisen from change to Gitlab::JsonCache https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29938/diffs.

Does this MR meet the acceptance criteria?

Conformity

Performance and testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by 🤖 GitLab Bot 🤖

Merge request reports