diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-30 11:16:45 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-30 11:16:45 +0400 |
| commit | 14f5199cdcd9a84bdd273b24ba8d8f2eb9f60c23 (patch) | |
| tree | c3b92e307179a44b198b9279a17d5091777ae8ba /spec/lib | |
| parent | cb71b26353b4b3d927e20678b6f26c50c7d7b7c2 (diff) | |
| parent | 0d5ae2802e887dcd95fe537a59450a2c0f548382 (diff) | |
Merge branch 'feature-ldap-tests' into 'master'
Feature ldap tests
Move specs to proper places. Relates to #154
This is already mergeable, will continue in a new branch for additions & refactorings.
See merge request !1053
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/auth_spec.rb (renamed from spec/lib/auth_spec.rb) | 0 | ||||
| -rw-r--r-- | spec/lib/gitlab/ldap/access_spec.rb (renamed from spec/lib/gitlab/ldap/ldap_access_spec.rb) | 0 | ||||
| -rw-r--r-- | spec/lib/gitlab/ldap/adapter_spec.rb (renamed from spec/lib/gitlab/ldap/ldap_adapter_spec.rb) | 0 | ||||
| -rw-r--r-- | spec/lib/gitlab/ldap/user_spec.rb (renamed from spec/lib/gitlab/ldap/ldap_user_auth_spec.rb) | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/oauth/user_spec.rb (renamed from spec/lib/oauth_spec.rb) | 0 |
5 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb index 073b811c3fb..073b811c3fb 100644 --- a/spec/lib/auth_spec.rb +++ b/spec/lib/gitlab/auth_spec.rb diff --git a/spec/lib/gitlab/ldap/ldap_access_spec.rb b/spec/lib/gitlab/ldap/access_spec.rb index d8c107502ba..d8c107502ba 100644 --- a/spec/lib/gitlab/ldap/ldap_access_spec.rb +++ b/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 index c3f07334431..c3f07334431 100644 --- a/spec/lib/gitlab/ldap/ldap_adapter_spec.rb +++ b/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_spec.rb index 1d3df52f0c2..de5717417f1 100644 --- a/spec/lib/gitlab/ldap/ldap_user_auth_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 index 2f15b5e0349..2f15b5e0349 100644 --- a/spec/lib/oauth_spec.rb +++ b/spec/lib/gitlab/oauth/user_spec.rb |