diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 16:54:59 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:33:19 -0600 |
| commit | 56de781a2cef437b6e1af748dc0c231af74e044d (patch) | |
| tree | c8186a283904e3cc7461c4289cd2e1a8a9daa69c /spec/support | |
| parent | 1fe7501b49f896b74102c4b970310aa9ae34da85 (diff) | |
| download | gitlab-ce-56de781a2cef437b6e1af748dc0c231af74e044d.tar.gz | |
Revert "Enable Style/DotPosition"
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.
# Conflicts:
# .rubocop.yml
# .rubocop_todo.yml
# lib/gitlab/ci/config/entry/global.rb
# lib/gitlab/ci/config/entry/jobs.rb
# spec/lib/gitlab/ci/config/entry/factory_spec.rb
# spec/lib/gitlab/ci/config/entry/global_spec.rb
# spec/lib/gitlab/ci/config/entry/job_spec.rb
# spec/lib/gitlab/ci/status/build/factory_spec.rb
# spec/lib/gitlab/incoming_email_spec.rb
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/ldap_helpers.rb | 8 | ||||
| -rw-r--r-- | spec/support/stub_gitlab_calls.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/support/ldap_helpers.rb b/spec/support/ldap_helpers.rb index ab635711cf7..079f244475c 100644 --- a/spec/support/ldap_helpers.rb +++ b/spec/support/ldap_helpers.rb @@ -16,8 +16,8 @@ module LdapHelpers # ) def stub_ldap_config(messages) messages.each do |config, value| - allow_any_instance_of(::Gitlab::LDAP::Config). - to receive(config.to_sym).and_return(value) + allow_any_instance_of(::Gitlab::LDAP::Config) + .to receive(config.to_sym).and_return(value) end end @@ -32,8 +32,8 @@ module LdapHelpers def stub_ldap_person_find_by_uid(uid, entry, provider = 'ldapmain') return_value = ::Gitlab::LDAP::Person.new(entry, provider) if entry.present? - allow(::Gitlab::LDAP::Person). - to receive(:find_by_uid).with(uid, any_args).and_return(return_value) + allow(::Gitlab::LDAP::Person) + .to receive(:find_by_uid).with(uid, any_args).and_return(return_value) end # Create a simple LDAP user entry. diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb index 07602c0cb40..a01ef576234 100644 --- a/spec/support/stub_gitlab_calls.rb +++ b/spec/support/stub_gitlab_calls.rb @@ -53,7 +53,7 @@ module StubGitlabCalls stub_request(:post, "#{gitlab_url}api/v3/session.json"). with(body: "{\"email\":\"test@test.com\",\"password\":\"123456\"}", - headers: { 'Content-Type' => 'application/json' }). + headers: { 'Content-Type' => 'application/json' }). to_return(status: 201, body: f, headers: { 'Content-Type' => 'application/json' }) end |