kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ce-jej/group-saml-metadata-endpoint' into 'master' 

[CE] Backport TokenAuthenticatable comparison method and stub_default_url_options

See merge request gitlab-org/gitlab-ce!19094
This commit is contained in:
Kamil Trzciński 2018-12-04 12:32:47 +00:00
parent 15c6e39026 1ede6eb057
commit 77f215b3f4
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/concerns/token_authenticatable.rb
View File

@ -53,6 +53,11 @@ module TokenAuthenticatable
define_method("reset_#{token_field}!") do
strategy.reset_token!(self)
end
define_method("#{token_field}_matches?") do |other_token|
token = read_attribute(token_field)
token.present? && ActiveSupport::SecurityUtils.variable_size_secure_compare(other_token, token)
end
end
end
end

5
spec/support/helpers/stub_configuration.rb
View File

@ -27,6 +27,11 @@ module StubConfiguration
allow(Gitlab.config.gitlab).to receive_messages(to_settings(messages))
end
def stub_default_url_options(host: "localhost", protocol: "http")
url_options = { host: host, protocol: protocol }
allow(Rails.application.routes).to receive(:default_url_options).and_return(url_options)
end
def stub_gravatar_setting(messages)
allow(Gitlab.config.gravatar).to receive_messages(to_settings(messages))
end