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
iv
gitlab-ce
Commits
13d941e1
Commit
13d941e1
authored
Jun 08, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Omniauth providers specs to not modify global configuration
parent
722211cd
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
5 deletions
+12
-5
CHANGELOG
CHANGELOG
+1
-0
spec/controllers/import/import_spec_helper.rb
spec/controllers/import/import_spec_helper.rb
+1
-1
spec/lib/gitlab/bitbucket_import/client_spec.rb
spec/lib/gitlab/bitbucket_import/client_spec.rb
+3
-1
spec/lib/gitlab/bitbucket_import/importer_spec.rb
spec/lib/gitlab/bitbucket_import/importer_spec.rb
+3
-1
spec/lib/gitlab/gitlab_import/client_spec.rb
spec/lib/gitlab/gitlab_import/client_spec.rb
+3
-1
spec/services/projects/import_service_spec.rb
spec/services/projects/import_service_spec.rb
+1
-1
No files found.
CHANGELOG
View file @
13d941e1
...
@@ -36,6 +36,7 @@ v 8.9.0 (unreleased)
...
@@ -36,6 +36,7 @@ v 8.9.0 (unreleased)
- Use downcased path to container repository as this is expected path by Docker
- Use downcased path to container repository as this is expected path by Docker
- Projects pending deletion will render a 404 page
- Projects pending deletion will render a 404 page
- Measure queue duration between gitlab-workhorse and Rails
- Measure queue duration between gitlab-workhorse and Rails
- Make Omniauth providers specs to not modify global configuration
- Make authentication service for Container Registry to be compatible with < Docker 1.11
- Make authentication service for Container Registry to be compatible with < Docker 1.11
- Add Application Setting to configure Container Registry token expire delay (default 5min)
- Add Application Setting to configure Container Registry token expire delay (default 5min)
- Cache assigned issue and merge request counts in sidebar nav
- Cache assigned issue and merge request counts in sidebar nav
...
...
spec/controllers/import/import_spec_helper.rb
View file @
13d941e1
...
@@ -28,6 +28,6 @@ module ImportSpecHelper
...
@@ -28,6 +28,6 @@ module ImportSpecHelper
app_id:
'asd123'
,
app_id:
'asd123'
,
app_secret:
'asd123'
app_secret:
'asd123'
)
)
Gitlab
.
config
.
omniauth
.
providers
<<
provider
allow
(
Gitlab
.
config
.
omniauth
).
to
receive
(
:providers
).
and_return
([
provider
])
end
end
end
end
spec/lib/gitlab/bitbucket_import/client_spec.rb
View file @
13d941e1
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
BitbucketImport
::
Client
,
lib:
true
do
describe
Gitlab
::
BitbucketImport
::
Client
,
lib:
true
do
include
ImportSpecHelper
let
(
:token
)
{
'123456'
}
let
(
:token
)
{
'123456'
}
let
(
:secret
)
{
'secret'
}
let
(
:secret
)
{
'secret'
}
let
(
:client
)
{
Gitlab
::
BitbucketImport
::
Client
.
new
(
token
,
secret
)
}
let
(
:client
)
{
Gitlab
::
BitbucketImport
::
Client
.
new
(
token
,
secret
)
}
before
do
before
do
Gitlab
.
config
.
omniauth
.
providers
<<
OpenStruct
.
new
(
app_id:
"asd123"
,
app_secret:
"asd123"
,
name:
"bitbucket"
)
stub_omniauth_provider
(
'bitbucket'
)
end
end
it
'all OAuth client options are symbols'
do
it
'all OAuth client options are symbols'
do
...
...
spec/lib/gitlab/bitbucket_import/importer_spec.rb
View file @
13d941e1
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
BitbucketImport
::
Importer
,
lib:
true
do
describe
Gitlab
::
BitbucketImport
::
Importer
,
lib:
true
do
include
ImportSpecHelper
before
do
before
do
Gitlab
.
config
.
omniauth
.
providers
<<
OpenStruct
.
new
(
app_id:
"asd123"
,
app_secret:
"asd123"
,
name:
"bitbucket"
)
stub_omniauth_provider
(
'bitbucket'
)
end
end
let
(
:statuses
)
do
let
(
:statuses
)
do
...
...
spec/lib/gitlab/gitlab_import/client_spec.rb
View file @
13d941e1
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
GitlabImport
::
Client
,
lib:
true
do
describe
Gitlab
::
GitlabImport
::
Client
,
lib:
true
do
include
ImportSpecHelper
let
(
:token
)
{
'123456'
}
let
(
:token
)
{
'123456'
}
let
(
:client
)
{
Gitlab
::
GitlabImport
::
Client
.
new
(
token
)
}
let
(
:client
)
{
Gitlab
::
GitlabImport
::
Client
.
new
(
token
)
}
before
do
before
do
Gitlab
.
config
.
omniauth
.
providers
<<
OpenStruct
.
new
(
app_id:
"asd123"
,
app_secret:
"asd123"
,
name:
"gitlab"
)
stub_omniauth_provider
(
'gitlab'
)
end
end
it
'all OAuth2 client options are symbols'
do
it
'all OAuth2 client options are symbols'
do
...
...
spec/services/projects/import_service_spec.rb
View file @
13d941e1
...
@@ -124,7 +124,7 @@ describe Projects::ImportService, services: true do
...
@@ -124,7 +124,7 @@ describe Projects::ImportService, services: true do
}
}
)
)
Gitlab
.
config
.
omniauth
.
providers
<<
provider
allow
(
Gitlab
.
config
.
omniauth
).
to
receive
(
:providers
).
and_return
([
provider
])
end
end
end
end
end
end
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