Commit c0f31845 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'knapsack-env-ci' into 'master'

Enable Knapsack only in CI environment

Fixes running tests locally. Enables Knapsack only in CI environment.

cc @grzesiek 

See merge request !4528
parents 915ad255 eb950191
...@@ -38,6 +38,7 @@ v 8.9.0 (unreleased) ...@@ -38,6 +38,7 @@ v 8.9.0 (unreleased)
- 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
- Use Knapsack only in CI environment
- Cache project build count in sidebar nav - Cache project build count in sidebar nav
- Reduce number of queries needed to render issue labels in the sidebar - Reduce number of queries needed to render issue labels in the sidebar
- Improve error handling importing projects - Improve error handling importing projects
......
...@@ -11,13 +11,15 @@ ENV['RAILS_ENV'] = 'test' ...@@ -11,13 +11,15 @@ ENV['RAILS_ENV'] = 'test'
require './config/environment' require './config/environment'
require 'rspec/expectations' require 'rspec/expectations'
require 'sidekiq/testing/inline' require 'sidekiq/testing/inline'
require 'knapsack'
require_relative 'capybara' require_relative 'capybara'
require_relative 'db_cleaner' require_relative 'db_cleaner'
require_relative 'rerun' require_relative 'rerun'
Knapsack::Adapters::SpinachAdapter.bind if ENV['CI']
require 'knapsack'
Knapsack::Adapters::RSpecAdapter.bind
end
%w(select2_helper test_env repo_helpers).each do |f| %w(select2_helper test_env repo_helpers).each do |f|
require Rails.root.join('spec', 'support', f) require Rails.root.join('spec', 'support', f)
......
...@@ -15,9 +15,11 @@ require 'rspec/rails' ...@@ -15,9 +15,11 @@ require 'rspec/rails'
require 'shoulda/matchers' require 'shoulda/matchers'
require 'sidekiq/testing/inline' require 'sidekiq/testing/inline'
require 'rspec/retry' require 'rspec/retry'
require 'knapsack'
Knapsack::Adapters::RSpecAdapter.bind if ENV['CI']
require 'knapsack'
Knapsack::Adapters::RSpecAdapter.bind
end
# Requires supporting ruby files with custom matchers and macros, etc, # Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories. # in spec/support/ and its subdirectories.
......
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