Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
f9a730eb
Commit
f9a730eb
authored
10 years ago
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix specs
parent
b56b96d4
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
13 deletions
+16
-13
spec/helpers/oauth_helper_spec.rb
spec/helpers/oauth_helper_spec.rb
+13
-10
spec/lib/gitlab/ldap/access_spec.rb
spec/lib/gitlab/ldap/access_spec.rb
+1
-1
spec/lib/gitlab/ldap/authentication_spec.rb
spec/lib/gitlab/ldap/authentication_spec.rb
+1
-1
spec/lib/gitlab/ldap/user_spec.rb
spec/lib/gitlab/ldap/user_spec.rb
+1
-1
No files found.
spec/helpers/oauth_helper_spec.rb
View file @
f9a730eb
...
...
@@ -2,16 +2,19 @@ require "spec_helper"
describe
OauthHelper
do
describe
"additional_providers"
do
it
'returns appropriate values'
do
[
[[
:twitter
,
:github
],
[
:twitter
,
:github
]],
[[
:ldap_main
],
[]],
[[
:twitter
,
:ldap_main
],
[
:twitter
]],
[[],
[]],
].
each
do
|
couple
|
allow
(
helper
).
to
receive
(
:enabled_oauth_providers
)
{
couple
.
first
}
additional_providers
.
should
include
(
*
couple
.
last
)
end
it
'returns all enabled providers'
do
allow
(
helper
).
to
receive
(
:enabled_oauth_providers
)
{
[
:twitter
,
:github
]
}
helper
.
additional_providers
.
should
include
(
*
[
:twitter
,
:github
])
end
it
'does not return ldap provider'
do
allow
(
helper
).
to
receive
(
:enabled_oauth_providers
)
{
[
:twitter
,
:ldapmain
]
}
helper
.
additional_providers
.
should
include
(
:twitter
)
end
it
'returns empty array'
do
allow
(
helper
).
to
receive
(
:enabled_oauth_providers
)
{
[]
}
helper
.
additional_providers
.
should
==
[]
end
end
end
\ No newline at end of file
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/ldap/access_spec.rb
View file @
f9a730eb
...
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
LDAP
::
Access
do
let
(
:access
)
{
Gitlab
::
LDAP
::
Access
.
new
user
}
let
(
:user
)
{
create
(
:
user
,
:ldap
)
}
let
(
:user
)
{
create
(
:
omniauth_user
)
}
describe
:allowed?
do
subject
{
access
.
allowed?
}
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/ldap/authentication_spec.rb
View file @
f9a730eb
...
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
LDAP
::
Authentication
do
let
(
:klass
)
{
Gitlab
::
LDAP
::
Authentication
}
let
(
:user
)
{
create
(
:
user
,
:ldap
,
extern_uid:
dn
)
}
let
(
:user
)
{
create
(
:
omniauth_user
,
extern_uid:
dn
)
}
let
(
:dn
)
{
'uid=john,ou=people,dc=example,dc=com'
}
let
(
:login
)
{
'john'
}
let
(
:password
)
{
'password'
}
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/ldap/user_spec.rb
View file @
f9a730eb
...
...
@@ -21,7 +21,7 @@ describe Gitlab::LDAP::User do
end
it
"connects to existing non-ldap user if the email matches"
do
existing_user
=
create
(
:omniauth_user
,
email:
'john@example.com'
)
existing_user
=
create
(
:omniauth_user
,
email:
'john@example.com'
,
provider:
"twitter"
)
expect
{
gl_user
.
save
}.
to_not
change
{
User
.
count
}
existing_user
.
reload
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment