summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-03-14 13:37:05 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-03-14 22:42:57 +0000
commitbc42a02ca14f45d105f045f5b0cbd3cde3d59ac6 (patch)
tree882b556be5b8ade91ee253d8c31425427a734823
parent4970bec642d5f4e79ce899cc2095a6248d89d65c (diff)
downloadgitlab-ce-bc42a02ca14f45d105f045f5b0cbd3cde3d59ac6.tar.gz
Merge branch '58969-fix-request-context-spec' into 'master'
Fix test environment pollution in spec/lib/gitlab/request_context_spec.rb Closes #58969 See merge request gitlab-org/gitlab-ce!26167 (cherry picked from commit ef9b601245461e9aae727a95421ead1729f2856d) fcf418d6 Fix test environment pollution in spec/lib/gitlab/request_context_spec.rb
-rw-r--r--spec/lib/gitlab/request_context_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/request_context_spec.rb b/spec/lib/gitlab/request_context_spec.rb
index 3ed57c2c916..23e45aff1c5 100644
--- a/spec/lib/gitlab/request_context_spec.rb
+++ b/spec/lib/gitlab/request_context_spec.rb
@@ -25,7 +25,7 @@ describe Gitlab::RequestContext do
[200, {}, ["Hello"]]
end
- Rails.application.middleware.build(endpoint).call(env)
+ described_class.new(endpoint).call(env)
expect(client_ip).to eq(load_balancer_ip)
end