From 0a1fccb2ed0e0479dbaa4c22726d5c7a440f014c Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Sat, 21 May 2016 20:17:15 -0500 Subject: Try to use knapsack --- features/support/env.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'features/support/env.rb') diff --git a/features/support/env.rb b/features/support/env.rb index 357d164d87f..6ebd012a40f 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -11,6 +11,7 @@ ENV['RAILS_ENV'] = 'test' require './config/environment' require 'rspec/expectations' require 'sidekiq/testing/inline' +require 'knapsack' require_relative 'capybara' require_relative 'db_cleaner' @@ -20,6 +21,8 @@ require_relative 'rerun' require Rails.root.join('spec', 'support', f) end +Knapsack::Adapters::CucumberAdapter.bind + Dir["#{Rails.root}/features/steps/shared/*.rb"].each { |file| require file } WebMock.allow_net_connect! -- cgit v1.2.1 From 8d8d2759efaba594ec010a030bed94785016e274 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Sun, 22 May 2016 20:23:40 -0500 Subject: WIP --- features/support/env.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'features/support/env.rb') diff --git a/features/support/env.rb b/features/support/env.rb index 6ebd012a40f..5a34159ec92 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -21,8 +21,6 @@ require_relative 'rerun' require Rails.root.join('spec', 'support', f) end -Knapsack::Adapters::CucumberAdapter.bind - Dir["#{Rails.root}/features/steps/shared/*.rb"].each { |file| require file } WebMock.allow_net_connect! -- cgit v1.2.1 From 77f8deec2ccbde0e502ecf35e1484f2c2e4e8a54 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Sun, 22 May 2016 20:34:36 -0500 Subject: Use own version of knapsack which supports spinach tests --- features/support/env.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'features/support/env.rb') diff --git a/features/support/env.rb b/features/support/env.rb index 5a34159ec92..b4b3e7359b4 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -11,12 +11,14 @@ ENV['RAILS_ENV'] = 'test' require './config/environment' require 'rspec/expectations' require 'sidekiq/testing/inline' -require 'knapsack' +require 'knapsack-gitlab' require_relative 'capybara' require_relative 'db_cleaner' require_relative 'rerun' +Knapsack::Adapters::SpinachAdapter.bind + %w(select2_helper test_env repo_helpers).each do |f| require Rails.root.join('spec', 'support', f) end -- cgit v1.2.1 From 86498d4d99472edcb70ab1631f463133995a8cbf Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Fri, 3 Jun 2016 17:39:53 +0200 Subject: Use knapsack everywhere --- features/support/env.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'features/support/env.rb') diff --git a/features/support/env.rb b/features/support/env.rb index b4b3e7359b4..4552db8ad77 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -11,7 +11,7 @@ ENV['RAILS_ENV'] = 'test' require './config/environment' require 'rspec/expectations' require 'sidekiq/testing/inline' -require 'knapsack-gitlab' +require 'knapsack' require_relative 'capybara' require_relative 'db_cleaner' -- cgit v1.2.1 From eb95019178a002e0c016e60c7b8ef3eb49f7997e Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Wed, 8 Jun 2016 11:43:13 +0200 Subject: Enable Knapsack only in CI environment --- features/support/env.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'features/support/env.rb') diff --git a/features/support/env.rb b/features/support/env.rb index 4552db8ad77..edc08cf0986 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -11,13 +11,15 @@ ENV['RAILS_ENV'] = 'test' require './config/environment' require 'rspec/expectations' require 'sidekiq/testing/inline' -require 'knapsack' require_relative 'capybara' require_relative 'db_cleaner' 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| require Rails.root.join('spec', 'support', f) -- cgit v1.2.1