summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-22 20:23:40 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-03 17:08:18 +0200
commit8d8d2759efaba594ec010a030bed94785016e274 (patch)
treee5fb4caab12b6684184607776fb42013db5bb1fd
parent20dc6a708b4bad9507412e3a96c1c0bd25cf6fc4 (diff)
downloadgitlab-ce-8d8d2759efaba594ec010a030bed94785016e274.tar.gz
WIP
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--features/support/env.rb2
2 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 837aed3ae0a..a5065693b5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ prepare:
variables:
USE_DB: "false"
script:
- #- bundle exec rake assets:precompile
+ - bundle exec rake assets:precompile
- echo "{}" > knapsack_rspec_report.json
- echo "{}" > knapsack_cucumber_report.json
artifacts:
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!