From 3387bbca742dabaafc656030503778b443822809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 27 Aug 2014 18:37:14 +0200 Subject: [PATCH 1/2] skip assets precompilation for regular run --- lib/tasks/tests.rake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake index faabcfafd..b6e04e4e7 100644 --- a/lib/tasks/tests.rake +++ b/lib/tasks/tests.rake @@ -1,16 +1,13 @@ namespace :ci do namespace :travis do desc "Run everyhting except cucumber" - task :other => [ :prepare, "tests:generate_fixtures", :spec, "jasmine:ci" ] + task :other => [ :prepare_db, "tests:generate_fixtures", :spec, "jasmine:ci" ] desc "Run cucumber" - task :cucumber => [ :prepare, "rake:cucumber" ] + task :cucumber => [ :prepare_db, "assets:precompile", "rake:cucumber" ] desc "Prepare db" task :prepare_db => [ "db:create", "db:test:load"] - - desc "Prepare" - task :prepare => [:prepare_db, "assets:precompile"] end end From 1b0de7f7cc19c0b5d573a56d4808b7c053532ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 27 Aug 2014 18:38:43 +0200 Subject: [PATCH 2/2] skip assets precompilation for cucumber run --- lib/tasks/tests.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/tests.rake b/lib/tasks/tests.rake index b6e04e4e7..7750f3b61 100644 --- a/lib/tasks/tests.rake +++ b/lib/tasks/tests.rake @@ -4,7 +4,7 @@ namespace :ci do task :other => [ :prepare_db, "tests:generate_fixtures", :spec, "jasmine:ci" ] desc "Run cucumber" - task :cucumber => [ :prepare_db, "assets:precompile", "rake:cucumber" ] + task :cucumber => [ :prepare_db, "rake:cucumber" ] desc "Prepare db" task :prepare_db => [ "db:create", "db:test:load"]