From 4fe9003855a3e0770db03eaf6563bd38a3c47701 Mon Sep 17 00:00:00 2001
From: Katrina Owen <katrina.owen@gmail.com>
Date: Mon, 18 Mar 2013 07:25:00 -0600
Subject: [PATCH] Tweak pie chart data tests

---
 test/functional/context_actions_data_test.rb | 34 +++++++-------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/test/functional/context_actions_data_test.rb b/test/functional/context_actions_data_test.rb
index e0ee8d1f..e87f6f01 100644
--- a/test/functional/context_actions_data_test.rb
+++ b/test/functional/context_actions_data_test.rb
@@ -9,8 +9,7 @@ class ContextActionsDataTest < ActionController::TestCase
 
     get :context_total_actions_data
 
-    expected = "&title=Spread of actions for all contexts,{font-size:16}&\n&pie=70,#505050,{font-size: 12px; color: #404040;}&\n&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&\n&values=&\n&pie_labels=&\n&links=&\n&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&\n&tool_tip=#x_label#: #val#%25&\n&x_label_style=9,,2,1&"
-    assert_equal expected, @response.body.chomp
+    assert_equal [], assigns[:actions_per_context]
   end
 
   def test_total_with_less_than_10_items
@@ -30,9 +29,7 @@ class ContextActionsDataTest < ActionController::TestCase
 
     get :context_total_actions_data
 
-    expected = "&title=Spread of actions for all contexts,{font-size:16}&\n&pie=70,#505050,{font-size: 12px; color: #404040;}&\n&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&\n&values=12,4,9,15,23,20,5,1,7&\n&pie_labels=one,two,three,four,five,six,seven,eight,nine&\n&links=/contexts/1,/contexts/2,/contexts/3,/contexts/4,/contexts/5,/contexts/6,/contexts/7,/contexts/8,/contexts/9&\n&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&\n&tool_tip=#x_label#: #val#%25&\n&x_label_style=9,,2,1&"
-
-    assert_equal expected, @response.body.chomp
+    assert_equal contexts, assigns[:actions_per_context]
   end
 
   def test_total_with_exactly_10_items
@@ -53,9 +50,7 @@ class ContextActionsDataTest < ActionController::TestCase
 
     get :context_total_actions_data
 
-    expected = "&title=Spread of actions for all contexts,{font-size:16}&\n&pie=70,#505050,{font-size: 12px; color: #404040;}&\n&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&\n&values=10,3,7,12,19,16,4,0,5,18&\n&pie_labels=one,two,three,four,five,six,seven,eight,nine,ten&\n&links=/contexts/1,/contexts/2,/contexts/3,/contexts/4,/contexts/5,/contexts/6,/contexts/7,/contexts/8,/contexts/9,/contexts/10&\n&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&\n&tool_tip=#x_label#: #val#%25&\n&x_label_style=9,,2,1&"
-
-    assert_equal expected, @response.body.chomp
+    assert_equal contexts, assigns[:actions_per_context]
   end
 
   def test_total_with_more_than_10_items
@@ -77,9 +72,9 @@ class ContextActionsDataTest < ActionController::TestCase
 
     get :context_total_actions_data
 
-    expected = "&title=Spread of actions for all contexts,{font-size:16}&\n&pie=70,#505050,{font-size: 12px; color: #404040;}&\n&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&\n&values=9,3,6,11,16,14,4,0,5,27&\n&pie_labels=one,two,three,four,five,six,seven,eight,nine,(others)&\n&links=/contexts/1,/contexts/2,/contexts/3,/contexts/4,/contexts/5,/contexts/6,/contexts/7,/contexts/8,/contexts/9,/contexts/-1&\n&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&\n&tool_tip=#x_label#: #val#%25&\n&x_label_style=9,,2,1&"
-
-    assert_equal expected, @response.body.chomp
+    contexts.pop
+    contexts[-1] = {'id' => -1, 'name' => '(others)', 'total' => 33}
+    assert_equal contexts, assigns[:actions_per_context]
   end
 
   def test_running_with_0_items
@@ -88,8 +83,7 @@ class ContextActionsDataTest < ActionController::TestCase
 
     get :context_running_actions_data
 
-    expected = "&title=Spread of running actions for visible contexts,{font-size:16}&\n&pie=60,#505050,{font-size: 12px; color: #404040;}&\n&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&\n&values=&\n&pie_labels=&\n&links=&\n&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&\n&tool_tip=#x_label#: #val#%25&\n&x_label_style=9,,2,1&"
-    assert_equal expected, @response.body.chomp
+    assert_equal [], assigns[:actions_per_context]
   end
 
   def test_running_with_less_than_10_items
@@ -109,9 +103,7 @@ class ContextActionsDataTest < ActionController::TestCase
 
     get :context_running_actions_data
 
-    expected = "&title=Spread of running actions for visible contexts,{font-size:16}&\n&pie=60,#505050,{font-size: 12px; color: #404040;}&\n&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&\n&values=12,4,9,15,23,20,5,1,7&\n&pie_labels=one,two,three,four,five,six,seven,eight,nine&\n&links=/contexts/1,/contexts/2,/contexts/3,/contexts/4,/contexts/5,/contexts/6,/contexts/7,/contexts/8,/contexts/9&\n&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&\n&tool_tip=#x_label#: #val#%25&\n&x_label_style=9,,2,1&"
-
-    assert_equal expected, @response.body.chomp
+    assert_equal contexts, assigns[:actions_per_context]
   end
 
   def test_running_with_exactly_10_items
@@ -132,9 +124,7 @@ class ContextActionsDataTest < ActionController::TestCase
 
     get :context_running_actions_data
 
-    expected = "&title=Spread of running actions for visible contexts,{font-size:16}&\n&pie=60,#505050,{font-size: 12px; color: #404040;}&\n&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&\n&values=10,3,7,12,19,16,4,0,5,18&\n&pie_labels=one,two,three,four,five,six,seven,eight,nine,ten&\n&links=/contexts/1,/contexts/2,/contexts/3,/contexts/4,/contexts/5,/contexts/6,/contexts/7,/contexts/8,/contexts/9,/contexts/10&\n&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&\n&tool_tip=#x_label#: #val#%25&\n&x_label_style=9,,2,1&"
-
-    assert_equal expected, @response.body.chomp
+    assert_equal contexts, assigns[:actions_per_context]
   end
 
   def test_running_with_more_than_10_items
@@ -156,9 +146,9 @@ class ContextActionsDataTest < ActionController::TestCase
 
     get :context_running_actions_data
 
-    expected = "&title=Spread of running actions for visible contexts,{font-size:16}&\n&pie=60,#505050,{font-size: 12px; color: #404040;}&\n&x_axis_steps=1& &y_ticks=5,10,5& &line=3,#87421F& &y_min=0& &y_max=20&\n&values=9,3,6,11,16,14,4,0,5,27&\n&pie_labels=one,two,three,four,five,six,seven,eight,nine,(others)&\n&links=/contexts/1,/contexts/2,/contexts/3,/contexts/4,/contexts/5,/contexts/6,/contexts/7,/contexts/8,/contexts/9,/contexts/-1&\n&colours=#d01f3c,#356aa0,#C79810,#c61fd0,#1fc6d0,#1fd076,#72d01f,#c6d01f,#d0941f,#40941f&\n&tool_tip=#x_label#: #val#%25&\n&x_label_style=9,,2,1&"
-
-    assert_equal expected, @response.body.chomp
+    contexts.pop
+    contexts[-1] = {'id' => -1, 'name' => '(others)', 'total' => 33}
+    assert_equal contexts, assigns[:actions_per_context]
   end
 
 end