Merge pull request #22 from veracross/test-character-encodings

Add emoji to test template values to test we can deal with unicode
veracross · Jun 27, 2019 · 40812ce · 40812ce
2 parents ac2dbb4 + 4a088f7
commit 40812ce
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 23 deletions.
diff --git a/lib/consult/template.rb b/lib/consult/template.rb
@@ -75,7 +75,7 @@ def contents
 
     def consul_contents(location)
       [@config[location]].compact.flatten.map do |key|
-        Diplomat::Kv.get(key, options: nil, not_found: :return, found: :return)
+        Diplomat::Kv.get(key, options: nil, not_found: :return, found: :return).force_encoding 'utf-8'
       end.join
     end
 

diff --git a/spec/support/expected/consul_elements.txt b/spec/support/expected/consul_elements.txt
@@ -1,2 +1,2 @@
-Earth is the 4th element
-Love is the 5th element!
+Earth is the 4th element 🌎
+Love is the 5th element! 💗
diff --git a/spec/support/expected/elements.txt b/spec/support/expected/elements.txt
@@ -1,2 +1,2 @@
-Air is the 1st element
-Fire is the 2nd element
+Air is the 1st element 💨
+Fire is the 2nd element 🔥
diff --git a/spec/support/expected/more_consul_elements.txt b/spec/support/expected/more_consul_elements.txt
@@ -1,3 +1,3 @@
-Earth is the 4th element
-Love is the 5th element!
-Aziz! Light!
+Earth is the 4th element 🌎
+Love is the 5th element! 💗
+Aziz! Light! 🙄
diff --git a/spec/support/expected/more_elements.txt b/spec/support/expected/more_elements.txt
@@ -1,3 +1,3 @@
-Air is the 1st element
-Fire is the 2nd element
-Water is the 3rd element
+Air is the 1st element 💨
+Fire is the 2nd element 🔥
+Water is the 3rd element 💧
diff --git a/spec/support/expected/multi_pass.txt b/spec/support/expected/multi_pass.txt
@@ -1,6 +1,6 @@
-Air is the 1st element
-Earth is the 4th element
-Fire is the 2nd element
-Water is the 3rd element
-Love is the 5th element!
-Aziz! Light!
+Air is the 1st element 💨
+Earth is the 4th element 🌎
+Fire is the 2nd element 🔥
+Water is the 3rd element 💧
+Love is the 5th element! 💗
+Aziz! Light! 🙄
diff --git a/spec/support/populate_consul.sh b/spec/support/populate_consul.sh
@@ -16,15 +16,18 @@ curl \
 
 curl \
     --request PUT \
-    --data $'Earth is the <%= vars[:earth] %>th element\n' \
+    -H "Content-Type: application/x-www-form-urlencoded; charset=utf-8" \
+    --data $'Earth is the <%= vars[:earth] %>th element 🌎\n' \
     http://localhost:8500/v1/kv/templates/elements/earth
 
 curl \
     --request PUT \
-    --data $'Love is the <%= vars[:love] %>th element!\n' \
+    -H "Content-Type: application/x-www-form-urlencoded; charset=utf-8" \
+    --data $'Love is the <%= vars[:love] %>th element! 💗\n' \
     http://localhost:8500/v1/kv/templates/elements/love
 
 curl \
     --request PUT \
-    --data $'Aziz! <%= vars[:aziz] %>\n' \
+    -H "Content-Type: application/x-www-form-urlencoded; charset=utf-8" \
+    --data $'Aziz! <%= vars[:aziz] %> 🙄\n' \
     http://localhost:8500/v1/kv/templates/elements/aziz
diff --git a/spec/support/templates/elements/air.txt b/spec/support/templates/elements/air.txt
@@ -1 +1 @@
-Air is the <%= vars[:air] %>st element
+Air is the <%= vars[:air] %>st element 💨
diff --git a/spec/support/templates/elements/fire.txt b/spec/support/templates/elements/fire.txt
@@ -1 +1 @@
-Fire is the <%= vars[:fire] %>nd element
+Fire is the <%= vars[:fire] %>nd element 🔥
diff --git a/spec/support/templates/elements/water.txt b/spec/support/templates/elements/water.txt
@@ -1 +1 @@
-Water is the <%= vars[:water] %>rd element
+Water is the <%= vars[:water] %>rd element 💧
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Air is the <%= vars[:air] %>st element
		Air is the <%= vars[:air] %>st element 💨
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Fire is the <%= vars[:fire] %>nd element
		Fire is the <%= vars[:fire] %>nd element 🔥
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Water is the <%= vars[:water] %>rd element
		Water is the <%= vars[:water] %>rd element 💧