Commit c946ee12 authored by Rémy Coutable's avatar Rémy Coutable

Enable the Layout/SpaceBeforeBlockBraces cop

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 932a6e69
...@@ -207,6 +207,13 @@ Layout/SpaceAroundKeyword: ...@@ -207,6 +207,13 @@ Layout/SpaceAroundKeyword:
Layout/SpaceAroundOperators: Layout/SpaceAroundOperators:
Enabled: true Enabled: true
# Checks that block braces have or don't have a space before the opening
# brace depending on configuration.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: space, no_space
Layout/SpaceBeforeBlockBraces:
Enabled: true
# No spaces before commas. # No spaces before commas.
Layout/SpaceBeforeComma: Layout/SpaceBeforeComma:
Enabled: true Enabled: true
......
...@@ -26,13 +26,6 @@ Layout/IndentArray: ...@@ -26,13 +26,6 @@ Layout/IndentArray:
Layout/IndentHash: Layout/IndentHash:
Enabled: false Enabled: false
# Offense count: 174
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: space, no_space
Layout/SpaceBeforeBlockBraces:
Enabled: false
# Offense count: 8 # Offense count: 8
# Cop supports --auto-correct. # Cop supports --auto-correct.
# Configuration parameters: AllowForAlignment. # Configuration parameters: AllowForAlignment.
......
...@@ -117,7 +117,7 @@ class ApplicationController < ActionController::Base ...@@ -117,7 +117,7 @@ class ApplicationController < ActionController::Base
Raven.capture_exception(exception) if sentry_enabled? Raven.capture_exception(exception) if sentry_enabled?
application_trace = ActionDispatch::ExceptionWrapper.new(env, exception).application_trace application_trace = ActionDispatch::ExceptionWrapper.new(env, exception).application_trace
application_trace.map!{ |t| " #{t}\n" } application_trace.map! { |t| " #{t}\n" }
logger.error "\n#{exception.class.name} (#{exception.message}):\n#{application_trace.join}" logger.error "\n#{exception.class.name} (#{exception.message}):\n#{application_trace.join}"
end end
......
...@@ -15,7 +15,7 @@ class Import::GitlabController < Import::BaseController ...@@ -15,7 +15,7 @@ class Import::GitlabController < Import::BaseController
@already_added_projects = current_user.created_projects.where(import_type: "gitlab") @already_added_projects = current_user.created_projects.where(import_type: "gitlab")
already_added_projects_names = @already_added_projects.pluck(:import_source) already_added_projects_names = @already_added_projects.pluck(:import_source)
@repos = @repos.to_a.reject{ |repo| already_added_projects_names.include? repo["path_with_namespace"] } @repos = @repos.to_a.reject { |repo| already_added_projects_names.include? repo["path_with_namespace"] }
end end
def jobs def jobs
......
...@@ -3,7 +3,7 @@ module GraphHelper ...@@ -3,7 +3,7 @@ module GraphHelper
refs = "" refs = ""
# Commit::ref_names already strips the refs/XXX from important refs (e.g. refs/heads/XXX) # Commit::ref_names already strips the refs/XXX from important refs (e.g. refs/heads/XXX)
# so anything leftover is internally used by GitLab # so anything leftover is internally used by GitLab
commit_refs = commit.ref_names(repo).reject{ |name| name.starts_with?('refs/') } commit_refs = commit.ref_names(repo).reject { |name| name.starts_with?('refs/') }
refs << commit_refs.join(' ') refs << commit_refs.join(' ')
# append note count # append note count
......
...@@ -151,7 +151,7 @@ module IssuablesHelper ...@@ -151,7 +151,7 @@ module IssuablesHelper
end end
def issuable_labels_tooltip(labels, limit: 5) def issuable_labels_tooltip(labels, limit: 5)
first, last = labels.partition.with_index{ |_, i| i < limit } first, last = labels.partition.with_index { |_, i| i < limit }
label_names = first.collect(&:name) label_names = first.collect(&:name)
label_names << "and #{last.size} more" unless last.empty? label_names << "and #{last.size} more" unless last.empty?
...@@ -329,7 +329,7 @@ module IssuablesHelper ...@@ -329,7 +329,7 @@ module IssuablesHelper
end end
def selected_template(issuable) def selected_template(issuable)
params[:issuable_template] if issuable_templates(issuable).any?{ |template| template[:name] == params[:issuable_template] } params[:issuable_template] if issuable_templates(issuable).any? { |template| template[:name] == params[:issuable_template] }
end end
def issuable_todo_button_data(issuable, todo, is_collapsed) def issuable_todo_button_data(issuable, todo, is_collapsed)
......
...@@ -206,7 +206,7 @@ module Network ...@@ -206,7 +206,7 @@ module Network
# Visit branching chains # Visit branching chains
leaves.each do |l| leaves.each do |l|
parents = l.parents(@map).select{|p| p.space.zero?} parents = l.parents(@map).select {|p| p.space.zero?}
parents.each do |p| parents.each do |p|
place_chain(p, l.time) place_chain(p, l.time)
end end
......
...@@ -77,20 +77,20 @@ class Note < ActiveRecord::Base ...@@ -77,20 +77,20 @@ class Note < ActiveRecord::Base
# Scopes # Scopes
scope :for_commit_id, ->(commit_id) { where(noteable_type: "Commit", commit_id: commit_id) } scope :for_commit_id, ->(commit_id) { where(noteable_type: "Commit", commit_id: commit_id) }
scope :system, ->{ where(system: true) } scope :system, -> { where(system: true) }
scope :user, ->{ where(system: false) } scope :user, -> { where(system: false) }
scope :common, ->{ where(noteable_type: ["", nil]) } scope :common, -> { where(noteable_type: ["", nil]) }
scope :fresh, ->{ order(created_at: :asc, id: :asc) } scope :fresh, -> { order(created_at: :asc, id: :asc) }
scope :updated_after, ->(time){ where('updated_at > ?', time) } scope :updated_after, ->(time) { where('updated_at > ?', time) }
scope :inc_author_project, ->{ includes(:project, :author) } scope :inc_author_project, -> { includes(:project, :author) }
scope :inc_author, ->{ includes(:author) } scope :inc_author, -> { includes(:author) }
scope :inc_relations_for_view, -> do scope :inc_relations_for_view, -> do
includes(:project, :author, :updated_by, :resolved_by, :award_emoji, :system_note_metadata) includes(:project, :author, :updated_by, :resolved_by, :award_emoji, :system_note_metadata)
end end
scope :diff_notes, ->{ where(type: %w(LegacyDiffNote DiffNote)) } scope :diff_notes, -> { where(type: %w(LegacyDiffNote DiffNote)) }
scope :new_diff_notes, ->{ where(type: 'DiffNote') } scope :new_diff_notes, -> { where(type: 'DiffNote') }
scope :non_diff_notes, ->{ where(type: ['Note', 'DiscussionNote', nil]) } scope :non_diff_notes, -> { where(type: ['Note', 'DiscussionNote', nil]) }
scope :with_associations, -> do scope :with_associations, -> do
# FYI noteable cannot be loaded for LegacyDiffNote for commits # FYI noteable cannot be loaded for LegacyDiffNote for commits
......
...@@ -71,7 +71,7 @@ class Settings < Settingslogic ...@@ -71,7 +71,7 @@ class Settings < Settingslogic
# check that `current` (string or integer) is a contant in `modul`. # check that `current` (string or integer) is a contant in `modul`.
def verify_constant(modul, current, default) def verify_constant(modul, current, default)
constant = modul.constants.find{ |name| modul.const_get(name) == current } constant = modul.constants.find { |name| modul.const_get(name) == current }
value = constant.nil? ? default : modul.const_get(constant) value = constant.nil? ? default : modul.const_get(constant)
if current.is_a? String if current.is_a? String
value = modul.const_get(current.upcase) rescue default value = modul.const_get(current.upcase) rescue default
......
...@@ -10,7 +10,7 @@ class AddUniqueIndexToLabels < ActiveRecord::Migration ...@@ -10,7 +10,7 @@ class AddUniqueIndexToLabels < ActiveRecord::Migration
def up def up
select_all('SELECT title, project_id, COUNT(id) as cnt FROM labels GROUP BY project_id, title HAVING COUNT(id) > 1').each do |label| select_all('SELECT title, project_id, COUNT(id) as cnt FROM labels GROUP BY project_id, title HAVING COUNT(id) > 1').each do |label|
label_title = quote_string(label['title']) label_title = quote_string(label['title'])
duplicated_ids = select_all("SELECT id FROM labels WHERE project_id = #{label['project_id']} AND title = '#{label_title}' ORDER BY id ASC").map{ |label| label['id'] } duplicated_ids = select_all("SELECT id FROM labels WHERE project_id = #{label['project_id']} AND title = '#{label_title}' ORDER BY id ASC").map { |label| label['id'] }
label_id = duplicated_ids.first label_id = duplicated_ids.first
duplicated_ids.delete(label_id) duplicated_ids.delete(label_id)
......
...@@ -30,7 +30,7 @@ class CleanupNamespacelessPendingDeleteProjects < ActiveRecord::Migration ...@@ -30,7 +30,7 @@ class CleanupNamespacelessPendingDeleteProjects < ActiveRecord::Migration
private private
def pending_delete_batch def pending_delete_batch
connection.exec_query(find_batch).map{ |row| row['id'].to_i } connection.exec_query(find_batch).map { |row| row['id'].to_i }
end end
BATCH_SIZE = 5000 BATCH_SIZE = 5000
......
...@@ -132,7 +132,7 @@ module API ...@@ -132,7 +132,7 @@ module API
expose :lfs_enabled?, as: :lfs_enabled expose :lfs_enabled?, as: :lfs_enabled
expose :creator_id expose :creator_id
expose :namespace, using: 'API::Entities::Namespace' expose :namespace, using: 'API::Entities::Namespace'
expose :forked_from_project, using: Entities::BasicProjectDetails, if: lambda{ |project, options| project.forked? } expose :forked_from_project, using: Entities::BasicProjectDetails, if: lambda { |project, options| project.forked? }
expose :import_status expose :import_status
expose :import_error, if: lambda { |_project, options| options[:user_can_admin_project] } expose :import_error, if: lambda { |_project, options| options[:user_can_admin_project] }
expose :avatar_url do |user, options| expose :avatar_url do |user, options|
......
...@@ -68,7 +68,7 @@ module API ...@@ -68,7 +68,7 @@ module API
expose :lfs_enabled?, as: :lfs_enabled expose :lfs_enabled?, as: :lfs_enabled
expose :creator_id expose :creator_id
expose :namespace, using: 'API::Entities::Namespace' expose :namespace, using: 'API::Entities::Namespace'
expose :forked_from_project, using: ::API::Entities::BasicProjectDetails, if: lambda{ |project, options| project.forked? } expose :forked_from_project, using: ::API::Entities::BasicProjectDetails, if: lambda { |project, options| project.forked? }
expose :avatar_url do |user, options| expose :avatar_url do |user, options|
user.avatar_url(only_path: false) user.avatar_url(only_path: false)
end end
......
...@@ -198,11 +198,11 @@ module Backup ...@@ -198,11 +198,11 @@ module Backup
end end
def archives_to_backup def archives_to_backup
ARCHIVES_TO_BACKUP.map{ |name| (name + ".tar.gz") unless skipped?(name) }.compact ARCHIVES_TO_BACKUP.map { |name| (name + ".tar.gz") unless skipped?(name) }.compact
end end
def folders_to_backup def folders_to_backup
FOLDERS_TO_BACKUP.reject{ |name| skipped?(name) } FOLDERS_TO_BACKUP.reject { |name| skipped?(name) }
end end
def disabled_features def disabled_features
......
...@@ -71,7 +71,7 @@ module Gitlab ...@@ -71,7 +71,7 @@ module Gitlab
end end
def config def config
Gitlab.config.omniauth.providers.find{|provider| provider.name == "gitlab"} Gitlab.config.omniauth.providers.find {|provider| provider.name == "gitlab"}
end end
def gitlab_options def gitlab_options
......
...@@ -127,7 +127,7 @@ describe Admin::UsersController do ...@@ -127,7 +127,7 @@ describe Admin::UsersController do
describe 'POST create' do describe 'POST create' do
it 'creates the user' do it 'creates the user' do
expect{ post :create, user: attributes_for(:user) }.to change{ User.count }.by(1) expect { post :create, user: attributes_for(:user) }.to change { User.count }.by(1)
end end
it 'shows only one error message for an invalid email' do it 'shows only one error message for an invalid email' do
......
...@@ -24,7 +24,7 @@ describe InvitesController do ...@@ -24,7 +24,7 @@ describe InvitesController do
describe 'GET #decline' do describe 'GET #decline' do
it 'declines user' do it 'declines user' do
get :decline, id: token get :decline, id: token
expect{member.reload}.to raise_error ActiveRecord::RecordNotFound expect {member.reload}.to raise_error ActiveRecord::RecordNotFound
expect(response).to have_http_status(302) expect(response).to have_http_status(302)
expect(flash[:notice]).to include 'You have declined the invitation to join' expect(flash[:notice]).to include 'You have declined the invitation to join'
......
...@@ -292,13 +292,13 @@ describe Projects::IssuesController do ...@@ -292,13 +292,13 @@ describe Projects::IssuesController do
it 'rejects an issue recognized as a spam' do it 'rejects an issue recognized as a spam' do
expect(Gitlab::Recaptcha).to receive(:load_configurations!).and_return(true) expect(Gitlab::Recaptcha).to receive(:load_configurations!).and_return(true)
expect { update_spam_issue }.not_to change{ issue.reload.title } expect { update_spam_issue }.not_to change { issue.reload.title }
end end
it 'rejects an issue recognized as a spam when recaptcha disabled' do it 'rejects an issue recognized as a spam when recaptcha disabled' do
stub_application_setting(recaptcha_enabled: false) stub_application_setting(recaptcha_enabled: false)
expect { update_spam_issue }.not_to change{ issue.reload.title } expect { update_spam_issue }.not_to change { issue.reload.title }
end end
it 'creates a spam log' do it 'creates a spam log' do
...@@ -358,7 +358,7 @@ describe Projects::IssuesController do ...@@ -358,7 +358,7 @@ describe Projects::IssuesController do
end end
it 'accepts an issue after recaptcha is verified' do it 'accepts an issue after recaptcha is verified' do
expect{ update_verified_issue }.to change{ issue.reload.title }.to(spammy_title) expect { update_verified_issue }.to change { issue.reload.title }.to(spammy_title)
end end
it 'marks spam log as recaptcha_verified' do it 'marks spam log as recaptcha_verified' do
......
...@@ -67,7 +67,7 @@ describe Projects::TodosController do ...@@ -67,7 +67,7 @@ describe Projects::TodosController do
end end
it "doesn't create todo" do it "doesn't create todo" do
expect{ go }.not_to change { user.todos.count } expect { go }.not_to change { user.todos.count }
expect(response).to have_http_status(404) expect(response).to have_http_status(404)
end end
end end
...@@ -135,7 +135,7 @@ describe Projects::TodosController do ...@@ -135,7 +135,7 @@ describe Projects::TodosController do
end end
it "doesn't create todo" do it "doesn't create todo" do
expect{ go }.not_to change { user.todos.count } expect { go }.not_to change { user.todos.count }
expect(response).to have_http_status(404) expect(response).to have_http_status(404)
end end
end end
......
...@@ -15,7 +15,7 @@ describe RegistrationsController do ...@@ -15,7 +15,7 @@ describe RegistrationsController do
it 'signs the user in' do it 'signs the user in' do
allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(false) allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(false)
expect { post(:create, user_params) }.not_to change{ ActionMailer::Base.deliveries.size } expect { post(:create, user_params) }.not_to change { ActionMailer::Base.deliveries.size }
expect(subject.current_user).not_to be_nil expect(subject.current_user).not_to be_nil
end end
end end
......
...@@ -138,7 +138,7 @@ describe Snippets::NotesController do ...@@ -138,7 +138,7 @@ describe Snippets::NotesController do
end end
it "deletes the note" do it "deletes the note" do
expect{ delete :destroy, request_params }.to change{ Note.count }.from(1).to(0) expect { delete :destroy, request_params }.to change { Note.count }.from(1).to(0)
end end
context 'system note' do context 'system note' do
...@@ -147,7 +147,7 @@ describe Snippets::NotesController do ...@@ -147,7 +147,7 @@ describe Snippets::NotesController do
end end
it "does not delete the note" do it "does not delete the note" do
expect{ delete :destroy, request_params }.not_to change{ Note.count } expect { delete :destroy, request_params }.not_to change { Note.count }
end end
end end
end end
...@@ -166,7 +166,7 @@ describe Snippets::NotesController do ...@@ -166,7 +166,7 @@ describe Snippets::NotesController do
end end
it "does not update the note" do it "does not update the note" do
expect{ delete :destroy, request_params }.not_to change{ Note.count } expect { delete :destroy, request_params }.not_to change { Note.count }
end end
end end
end end
......
...@@ -16,7 +16,7 @@ feature 'Password reset' do ...@@ -16,7 +16,7 @@ feature 'Password reset' do
user.send_reset_password_instructions user.send_reset_password_instructions
user.update_attribute(:reset_password_sent_at, 5.minutes.ago) user.update_attribute(:reset_password_sent_at, 5.minutes.ago)
expect{ forgot_password(user) }.to change{ user.reset_password_sent_at } expect { forgot_password(user) }.to change { user.reset_password_sent_at }
expect(page).to have_content(I18n.t('devise.passwords.send_paranoid_instructions')) expect(page).to have_content(I18n.t('devise.passwords.send_paranoid_instructions'))
expect(current_path).to eq new_user_session_path expect(current_path).to eq new_user_session_path
end end
...@@ -27,7 +27,7 @@ feature 'Password reset' do ...@@ -27,7 +27,7 @@ feature 'Password reset' do
# Reload because PG handles datetime less precisely than Ruby/Rails # Reload because PG handles datetime less precisely than Ruby/Rails
user.reload user.reload
expect{ forgot_password(user) }.not_to change{ user.reset_password_sent_at } expect { forgot_password(user) }.not_to change { user.reset_password_sent_at }
expect(page).to have_content(I18n.t('devise.passwords.send_paranoid_instructions')) expect(page).to have_content(I18n.t('devise.passwords.send_paranoid_instructions'))
expect(current_path).to eq new_user_session_path expect(current_path).to eq new_user_session_path
end end
......
...@@ -104,7 +104,7 @@ feature 'Users', js: true do ...@@ -104,7 +104,7 @@ feature 'Users', js: true do
end end
def errors_on_page(page) def errors_on_page(page)
page.find('#error_explanation').find('ul').all('li').map{ |item| item.text }.join("\n") page.find('#error_explanation').find('ul').all('li').map { |item| item.text }.join("\n")
end end
def number_of_errors_on_page(page) def number_of_errors_on_page(page)
......
...@@ -15,7 +15,7 @@ describe Bitbucket::Paginator do ...@@ -15,7 +15,7 @@ describe Bitbucket::Paginator do
expect(paginator.items).to match(['item_2']) expect(paginator.items).to match(['item_2'])
allow(paginator).to receive(:fetch_next_page).and_return(nil) allow(paginator).to receive(:fetch_next_page).and_return(nil)
expect{ paginator.items }.to raise_error(StopIteration) expect { paginator.items }.to raise_error(StopIteration)
end end
end end
end end
...@@ -1323,11 +1323,11 @@ EOT ...@@ -1323,11 +1323,11 @@ EOT
describe "Error handling" do describe "Error handling" do
it "fails to parse YAML" do it "fails to parse YAML" do
expect{GitlabCiYamlProcessor.new("invalid: yaml: test")}.to raise_error(Psych::SyntaxError) expect {GitlabCiYamlProcessor.new("invalid: yaml: test")}.to raise_error(Psych::SyntaxError)
end end
it "indicates that object is invalid" do it "indicates that object is invalid" do
expect{GitlabCiYamlProcessor.new("invalid_yaml")}.to raise_error(GitlabCiYamlProcessor::ValidationError) expect {GitlabCiYamlProcessor.new("invalid_yaml")}.to raise_error(GitlabCiYamlProcessor::ValidationError)
end end
it "returns errors if tags parameter is invalid" do it "returns errors if tags parameter is invalid" do
......
...@@ -56,7 +56,7 @@ describe ExtractsPath do ...@@ -56,7 +56,7 @@ describe ExtractsPath do
context 'subclass overrides get_id' do context 'subclass overrides get_id' do
it 'uses ref returned by get_id' do it 'uses ref returned by get_id' do
allow_any_instance_of(self.class).to receive(:get_id){ '38008cb17ce1466d8fec2dfa6f6ab8dcfe5cf49e' } allow_any_instance_of(self.class).to receive(:get_id) { '38008cb17ce1466d8fec2dfa6f6ab8dcfe5cf49e' }
assign_ref_vars assign_ref_vars
......
...@@ -15,7 +15,7 @@ describe Gitlab::BitbucketImport::ProjectCreator do ...@@ -15,7 +15,7 @@ describe Gitlab::BitbucketImport::ProjectCreator do
has_wiki?: false) has_wiki?: false)
end end
let(:namespace){ create(:group, owner: user) } let(:namespace) { create(:group, owner: user) }
let(:token) { "asdasd12345" } let(:token) { "asdasd12345" }
let(:secret) { "sekrettt" } let(:secret) { "sekrettt" }
let(:access_params) { { bitbucket_access_token: token, bitbucket_access_token_secret: secret } } let(:access_params) { { bitbucket_access_token: token, bitbucket_access_token_secret: secret } }
......
...@@ -422,11 +422,11 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -422,11 +422,11 @@ describe Gitlab::Git::Repository, seed_helper: true do
it "should fail if we create an existing branch" do it "should fail if we create an existing branch" do
@repo.create_branch('duplicated_branch', 'master') @repo.create_branch('duplicated_branch', 'master')
expect{@repo.create_branch('duplicated_branch', 'master')}.to raise_error("Branch duplicated_branch already exists") expect {@repo.create_branch('duplicated_branch', 'master')}.to raise_error("Branch duplicated_branch already exists")
end end
it "should fail if we create a branch from a non existing ref" do it "should fail if we create a branch from a non existing ref" do
expect{@repo.create_branch('branch_based_in_wrong_ref', 'master_2_the_revenge')}.to raise_error("Invalid reference master_2_the_revenge") expect {@repo.create_branch('branch_based_in_wrong_ref', 'master_2_the_revenge')}.to raise_error("Invalid reference master_2_the_revenge")
end end
after(:all) do after(:all) do
......
...@@ -12,7 +12,7 @@ describe Gitlab::GitlabImport::ProjectCreator do ...@@ -12,7 +12,7 @@ describe Gitlab::GitlabImport::ProjectCreator do
owner: { name: "john" } owner: { name: "john" }
}.with_indifferent_access }.with_indifferent_access
end end
let(:namespace){ create(:group, owner: user) } let(:namespace) { create(:group, owner: user) }
let(:token) { "asdffg" } let(:token) { "asdffg" }
let(:access_params) { { gitlab_access_token: token } } let(:access_params) { { gitlab_access_token: token } }
......
...@@ -9,7 +9,7 @@ describe Gitlab::GoogleCodeImport::ProjectCreator do ...@@ -9,7 +9,7 @@ describe Gitlab::GoogleCodeImport::ProjectCreator do
"repositoryUrls" => ["https://vim.googlecode.com/git/"] "repositoryUrls" => ["https://vim.googlecode.com/git/"]
) )
end end
let(:namespace){ create(:group, owner: user) } let(:namespace) { create(:group, owner: user) }
before do before do
namespace.add_owner(user) namespace.add_owner(user)
......
require 'spec_helper' require 'spec_helper'
describe Gitlab::ImportExport::AttributeCleaner do describe Gitlab::ImportExport::AttributeCleaner do
let(:relation_class){ double('relation_class').as_null_object } let(:relation_class) { double('relation_class').as_null_object }
let(:unsafe_hash) do let(:unsafe_hash) do
{ {
'id' => 101, 'id' => 101,
......
...@@ -7,7 +7,7 @@ describe Gitlab::LDAP::Config do ...@@ -7,7 +7,7 @@ describe Gitlab::LDAP::Config do
describe '#initialize' do describe '#initialize' do
it 'requires a provider' do it 'requires a provider' do
expect{ described_class.new }.to raise_error ArgumentError expect { described_class.new }.to raise_error ArgumentError
end end
it 'works' do it 'works' do
...@@ -15,7 +15,7 @@ describe Gitlab::LDAP::Config do ...@@ -15,7 +15,7 @@ describe Gitlab::LDAP::Config do
end end
it 'raises an error if a unknown provider is used' do it 'raises an error if a unknown provider is used' do
expect{ described_class.new 'unknown' }.to raise_error(RuntimeError) expect { described_class.new 'unknown' }.to raise_error(RuntimeError)
end end
end end
......
...@@ -61,12 +61,12 @@ describe Gitlab::LDAP::User do ...@@ -61,12 +61,12 @@ describe Gitlab::LDAP::User do
it "finds the user if already existing" do it "finds the user if already existing" do
create(:omniauth_user, extern_uid: 'my-uid', provider: 'ldapmain') create(:omniauth_user, extern_uid: 'my-uid', provider: 'ldapmain')
expect{ ldap_user.save }.not_to change{ User.count } expect { ldap_user.save }.not_to change { User.count }
end end
it "connects to existing non-ldap user if the email matches" do it "connects to existing non-ldap user if the email matches" do
existing_user = create(:omniauth_user, email: 'john@example.com', provider: "twitter") existing_user = create(:omniauth_user, email: 'john@example.com', provider: "twitter")
expect{ ldap_user.save }.not_to change{ User.count } expect { ldap_user.save }.not_to change { User.count }
existing_user.reload existing_user.reload
expect(existing_user.ldap_identity.extern_uid).to eql 'my-uid' expect(existing_user.ldap_identity.extern_uid).to eql 'my-uid'
...@@ -75,7 +75,7 @@ describe Gitlab::LDAP::User do ...@@ -75,7 +75,7 @@ describe Gitlab::LDAP::User do
it 'connects to existing ldap user if the extern_uid changes' do it 'connects to existing ldap user if the extern_uid changes' do
existing_user = create(:omniauth_user, email: 'john@example.com', extern_uid: 'old-uid', provider: 'ldapmain') existing_user = create(:omniauth_user, email: 'john@example.com', extern_uid: 'old-uid', provider: 'ldapmain')
expect{ ldap_user.save }.not_to change{ User.count } expect { ldap_user.save }.not_to change { User.count }
existing_user.reload existing_user.reload
expect(existing_user.ldap_identity.extern_uid).to eql 'my-uid' expect(existing_user.ldap_identity.extern_uid).to eql 'my-uid'
...