Commit c9d1a9d0 authored by Douwe Maan's avatar Douwe Maan

Move license setup to spec/support.

parent 97bfd764
RSpec.configure do |config|
config.before(:all) do
Gitlab::License.encryption_key = OpenSSL::PKey::RSA.generate(2048)
FactoryGirl.create(:license)
end
end
...@@ -23,8 +23,6 @@ module TestEnv ...@@ -23,8 +23,6 @@ module TestEnv
# See gitlab.yml.example test section for paths # See gitlab.yml.example test section for paths
# #
def init(opts = {}) def init(opts = {})
setup_license
# Disable mailer for spinach tests # Disable mailer for spinach tests
disable_mailer if opts[:mailer] == false disable_mailer if opts[:mailer] == false
...@@ -50,12 +48,6 @@ module TestEnv ...@@ -50,12 +48,6 @@ module TestEnv
allow_any_instance_of(NotificationService).to receive(:mailer).and_call_original allow_any_instance_of(NotificationService).to receive(:mailer).and_call_original
end end
def setup_license
Gitlab::License.encryption_key = OpenSSL::PKey::RSA.generate(2048)
FactoryGirl.create(:license)
end
# Clean /tmp/tests # Clean /tmp/tests
# #
# Keeps gitlab-shell and gitlab-test # Keeps gitlab-shell and gitlab-test
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment