From 54c4cd2ddb23e3acf756881c23e78cf61d23e1a6 Mon Sep 17 00:00:00 2001
From: Zog
Date: Fri, 9 Feb 2018 10:18:56 +0100
Subject: Refs 5807; Force jest specs

---
 lib/tasks/ci.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 13d7b8d73..fdd813516 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -38,8 +38,8 @@ namespace :ci do
   end
 
   task :jest => "ci:assets" do
-    sh "yarn --no-progress install" # Hack to force install jest after webpack 
-    sh "node_modules/.bin/jest" unless ["CHOUETTE_JEST_DISABLED"]
+    sh "yarn --no-progress install" # Hack to force install jest after webpack
+    sh "node_modules/.bin/jest"
   end
 
   desc "Deploy after CI"
-- 
cgit v1.2.3


From 708c2fbe2f579426972a45f9a716d844a8e825ae Mon Sep 17 00:00:00 2001
From: Zog
Date: Thu, 8 Feb 2018 13:48:13 +0100
Subject: Refs #5669 @2h; Fix Specs

---
 lib/af83/decorator/link.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/af83/decorator/link.rb b/lib/af83/decorator/link.rb
index de7106740..ee09f80dc 100644
--- a/lib/af83/decorator/link.rb
+++ b/lib/af83/decorator/link.rb
@@ -130,7 +130,9 @@ class AF83::Decorator::Link
     out[:method] = link_method
     out[:class] = extra_class
     out.delete(:link_class)
+    out.delete(:link_method)
     out[:class] += " disabled" if disabled
+    out[:class].strip!
     out[:disabled] = !!disabled
     out
   end
-- 
cgit v1.2.3