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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c9d1a9d0
Commit
c9d1a9d0
authored
May 05, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move license setup to spec/support.
parent
97bfd764
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
spec/support/license.rb
spec/support/license.rb
+7
-0
spec/support/test_env.rb
spec/support/test_env.rb
+0
-8
No files found.
spec/support/license.rb
0 → 100644
View file @
c9d1a9d0
RSpec
.
configure
do
|
config
|
config
.
before
(
:all
)
do
Gitlab
::
License
.
encryption_key
=
OpenSSL
::
PKey
::
RSA
.
generate
(
2048
)
FactoryGirl
.
create
(
:license
)
end
end
spec/support/test_env.rb
View file @
c9d1a9d0
...
...
@@ -23,8 +23,6 @@ module TestEnv
# See gitlab.yml.example test section for paths
#
def
init
(
opts
=
{})
setup_license
# Disable mailer for spinach tests
disable_mailer
if
opts
[
:mailer
]
==
false
...
...
@@ -50,12 +48,6 @@ module TestEnv
allow_any_instance_of
(
NotificationService
).
to
receive
(
:mailer
).
and_call_original
end
def
setup_license
Gitlab
::
License
.
encryption_key
=
OpenSSL
::
PKey
::
RSA
.
generate
(
2048
)
FactoryGirl
.
create
(
:license
)
end
# Clean /tmp/tests
#
# Keeps gitlab-shell and gitlab-test
...
...
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