Merge pull request #290 from af83/4126-add-i18n-js

4126 Add i18n to JS

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index fdd813516..c46cf7416 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -31,15 +31,16 @@ namespace :ci do
     sh "bundle exec bundle-audit check --update"
   end
 
-  task :spec => ["ci:assets","spec"]
-
   task :assets do
     sh "RAILS_ENV=test bundle exec rake assets:precompile"
   end
 
-  task :jest => "ci:assets" do
-    sh "yarn --no-progress install" # Hack to force install jest after webpack
-    sh "node_modules/.bin/jest"
+  task :i18n_js_export do
+    sh "RAILS_ENV=test bundle exec rake i18n:js:export"
+  end
+
+  task :jest do
+    sh "node_modules/.bin/jest" unless ["CHOUETTE_JEST_DISABLED"]
   end
 
   desc "Deploy after CI"
@@ -59,4 +60,4 @@ namespace :ci do
 end
 
 desc "Run continuous integration tasks (spec, ...)"
-task :ci => ["ci:setup", "ci:spec", "ci:jest", "cucumber", "ci:check_security", "ci:deploy", "ci:clean"]
+task :ci => ["ci:setup", "ci:assets", "ci:i18n_js_export", "spec", "ci:jest", "cucumber", "ci:check_security", "ci:deploy", "ci:clean"]