From 6840a276d51962cf5c4e1111994cefd9843f16c0 Mon Sep 17 00:00:00 2001 From: Jan-Willem van der Meer Date: Fri, 29 Aug 2014 13:49:01 +0200 Subject: [PATCH 1/3] Fix naming convention of LDAP tests --- spec/lib/gitlab/ldap/{ldap_access_spec.rb => access_spec.rb} | 0 spec/lib/gitlab/ldap/{ldap_adapter_spec.rb => adapter_spec.rb} | 0 .../lib/gitlab/ldap/{ldap_user_auth_spec.rb => user_auth_spec.rb} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename spec/lib/gitlab/ldap/{ldap_access_spec.rb => access_spec.rb} (100%) rename spec/lib/gitlab/ldap/{ldap_adapter_spec.rb => adapter_spec.rb} (100%) rename spec/lib/gitlab/ldap/{ldap_user_auth_spec.rb => user_auth_spec.rb} (100%) diff --git a/spec/lib/gitlab/ldap/ldap_access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb similarity index 100% rename from spec/lib/gitlab/ldap/ldap_access_spec.rb rename to spec/lib/gitlab/ldap/access_spec.rb diff --git a/spec/lib/gitlab/ldap/ldap_adapter_spec.rb b/spec/lib/gitlab/ldap/adapter_spec.rb similarity index 100% rename from spec/lib/gitlab/ldap/ldap_adapter_spec.rb rename to spec/lib/gitlab/ldap/adapter_spec.rb diff --git a/spec/lib/gitlab/ldap/ldap_user_auth_spec.rb b/spec/lib/gitlab/ldap/user_auth_spec.rb similarity index 100% rename from spec/lib/gitlab/ldap/ldap_user_auth_spec.rb rename to spec/lib/gitlab/ldap/user_auth_spec.rb From 97547428bd481b984a4c5513931617db0d890ee5 Mon Sep 17 00:00:00 2001 From: Jan-Willem van der Meer Date: Fri, 29 Aug 2014 16:04:00 +0200 Subject: [PATCH 2/3] Rename ldap tests even further --- spec/lib/gitlab/ldap/{user_auth_spec.rb => user_spec.rb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spec/lib/gitlab/ldap/{user_auth_spec.rb => user_spec.rb} (100%) diff --git a/spec/lib/gitlab/ldap/user_auth_spec.rb b/spec/lib/gitlab/ldap/user_spec.rb similarity index 100% rename from spec/lib/gitlab/ldap/user_auth_spec.rb rename to spec/lib/gitlab/ldap/user_spec.rb From 0d5ae2802e887dcd95fe537a59450a2c0f548382 Mon Sep 17 00:00:00 2001 From: Jan-Willem van der Meer Date: Fri, 29 Aug 2014 17:29:42 +0200 Subject: [PATCH 3/3] Move and rename ldap / oauth specs --- lib/gitlab/ldap/adapter.rb | 3 ++- spec/lib/{ => gitlab}/auth_spec.rb | 0 spec/lib/gitlab/ldap/user_spec.rb | 2 +- spec/lib/{oauth_spec.rb => gitlab/oauth/user_spec.rb} | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename spec/lib/{ => gitlab}/auth_spec.rb (100%) rename spec/lib/{oauth_spec.rb => gitlab/oauth/user_spec.rb} (100%) diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb index ca239bea884..68ac1b22909 100644 --- a/lib/gitlab/ldap/adapter.rb +++ b/lib/gitlab/ldap/adapter.rb @@ -86,7 +86,8 @@ module Gitlab end def dn_matches_filter?(dn, filter) - ldap_search(base: dn, filter: filter, scope: Net::LDAP::SearchScope_BaseObject, attributes: %w{dn}).any? + ldap_search(base: dn, filter: filter, + scope: Net::LDAP::SearchScope_BaseObject, attributes: %w{dn}).any? end def ldap_search(*args) diff --git a/spec/lib/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb similarity index 100% rename from spec/lib/auth_spec.rb rename to spec/lib/gitlab/auth_spec.rb diff --git a/spec/lib/gitlab/ldap/user_spec.rb b/spec/lib/gitlab/ldap/user_spec.rb index 501642dca79..71b316bee2f 100644 --- a/spec/lib/gitlab/ldap/user_spec.rb +++ b/spec/lib/gitlab/ldap/user_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Gitlab::LDAP do +describe Gitlab::LDAP::User do let(:gl_auth) { Gitlab::LDAP::User } before do diff --git a/spec/lib/oauth_spec.rb b/spec/lib/gitlab/oauth/user_spec.rb similarity index 100% rename from spec/lib/oauth_spec.rb rename to spec/lib/gitlab/oauth/user_spec.rb