diff options
author | John T Skarbek <jtslear@gmail.com> | 2019-03-05 20:44:51 +0300 |
---|---|---|
committer | John T Skarbek <jtslear@gmail.com> | 2019-03-05 20:44:51 +0300 |
commit | 3f5df8c2cd3faf0e2b583aafeed10027f182cca5 (patch) | |
tree | 06149e8b6e1df689226a179d401dfde9b68b206c /spec/support/helpers | |
parent | ad220b8b0f8319a9574ed2c490206ade63f22d44 (diff) | |
parent | 26bff00d64d026ca99fbe348c239dc8060c00743 (diff) |
Merge commit '26bff00d64d026ca99fbe348c239dc8060c00743' into 11-9-stable
Diffstat (limited to 'spec/support/helpers')
-rw-r--r-- | spec/support/helpers/file_mover_helpers.rb | 12 | ||||
-rw-r--r-- | spec/support/helpers/login_helpers.rb | 13 |
2 files changed, 20 insertions, 5 deletions
diff --git a/spec/support/helpers/file_mover_helpers.rb b/spec/support/helpers/file_mover_helpers.rb new file mode 100644 index 00000000000..1ba7cc03354 --- /dev/null +++ b/spec/support/helpers/file_mover_helpers.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +module FileMoverHelpers + def stub_file_mover(file_path, stub_real_path: nil) + file_name = File.basename(file_path) + allow(Pathname).to receive(:new).and_call_original + + expect_next_instance_of(Pathname, a_string_including(file_name)) do |pathname| + allow(pathname).to receive(:realpath) { stub_real_path || pathname.cleanpath } + end + end +end diff --git a/spec/support/helpers/login_helpers.rb b/spec/support/helpers/login_helpers.rb index 3fee6872498..4a0cf62a661 100644 --- a/spec/support/helpers/login_helpers.rb +++ b/spec/support/helpers/login_helpers.rb @@ -47,7 +47,7 @@ module LoginHelpers end def gitlab_sign_in_via(provider, user, uid, saml_response = nil) - mock_auth_hash(provider, uid, user.email, saml_response) + mock_auth_hash_with_saml_xml(provider, uid, user.email, saml_response) visit new_user_session_path click_link provider end @@ -87,7 +87,12 @@ module LoginHelpers click_link "oauth-login-#{provider}" end - def mock_auth_hash(provider, uid, email, saml_response = nil) + def mock_auth_hash_with_saml_xml(provider, uid, email, saml_response) + response_object = { document: saml_xml(saml_response) } + mock_auth_hash(provider, uid, email, response_object: response_object) + end + + def mock_auth_hash(provider, uid, email, response_object: nil) # The mock_auth configuration allows you to set per-provider (or default) # authentication hashes to return during integration testing. OmniAuth.config.mock_auth[provider.to_sym] = OmniAuth::AuthHash.new({ @@ -110,9 +115,7 @@ module LoginHelpers image: 'mock_user_thumbnail_url' } }, - response_object: { - document: saml_xml(saml_response) - } + response_object: response_object } }) Rails.application.env_config['omniauth.auth'] = OmniAuth.config.mock_auth[provider.to_sym] |