From a724463f7cb2d151d90ca071688f73e90a974940 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 12 Jul 2017 12:27:07 +0100 Subject: [PATCH] Update docker_patched.rake --- docker_patched.rake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docker_patched.rake b/docker_patched.rake index b12ca11..be06906 100644 --- a/docker_patched.rake +++ b/docker_patched.rake @@ -30,18 +30,18 @@ task 'docker:test' do ENV["RAILS_ENV"] = "test" @good = run_or_fail("bundle exec rake db:create db:migrate") - unless ENV["JS_ONLY"] or ENV["SINGLE_PLUGIN"] - @good &&= run_or_fail("bundle exec rspec") - - if ENV["LOAD_PLUGINS"] - @good &&= run_or_fail("bundle exec rake plugin:spec") + unless ENV["JS_ONLY"] + if ENV["SINGLE_PLUGIN"] + @good &&= run_or_fail("bundle exec rake plugin:spec['#{ENV["SINGLE_PLUGIN"]}']") + else + @good &&= run_or_fail("bundle exec rspec") + + if ENV["LOAD_PLUGINS"] + @good &&= run_or_fail("bundle exec rake plugin:spec") + end end end - if ENV["SINGLE_PLUGIN"] - @good &&= run_or_fail("bundle exec rake plugin:spec['#{ENV["SINGLE_PLUGIN"]}']") - end - unless ENV["RUBY_ONLY"] unless["SINGLE_PLUGIN"] @good &&= run_or_fail("eslint app/assets/javascripts")