From 5c882acd05b914f2af75bcf78856d50a91773c2c Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Tue, 20 Jan 2015 15:29:45 -0300
Subject: [PATCH] site_tour: fix step sequence for groups

---
 plugins/site_tour/test/unit/site_tour_plugin_test.rb | 32 ++++++++++++++++++++++++++++++++
 plugins/site_tour/views/tour_actions.html.erb        | 15 ++++++++-------
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/plugins/site_tour/test/unit/site_tour_plugin_test.rb b/plugins/site_tour/test/unit/site_tour_plugin_test.rb
index 3fd3c35..52907db 100644
--- a/plugins/site_tour/test/unit/site_tour_plugin_test.rb
+++ b/plugins/site_tour/test/unit/site_tour_plugin_test.rb
@@ -38,4 +38,36 @@ class SiteTourPluginTest < ActionView::TestCase
     assert_no_tag_in_string instance_exec(&plugin.body_ending), :tag => "script"
   end
 
+  should 'render javascript tag with tooltip actions and group triggers' do
+    expects(:language).returns('en').at_least_once
+
+    settings = Noosfero::Plugin::Settings.new(Environment.default, SiteTourPlugin)
+    settings.actions = [{:language => 'en', :group_name => 'test', :selector => 'body', :description => 'Test'}]
+    settings.group_triggers = [{:group_name => 'test', :selector => 'body', :event => 'click'}]
+    settings.save!
+
+    expects(:environment).returns(Environment.default)
+    body_ending = instance_exec(&plugin.body_ending)
+    assert_match /siteTourPlugin\.add\('test', 'body', 'Test', 1\);/, body_ending
+    assert_match /siteTourPlugin\.addGroupTrigger\('test', 'body', 'click'\);/, body_ending
+  end
+
+  should 'start each tooltip group with the correct step order' do
+    expects(:language).returns('en').at_least_once
+
+    settings = Noosfero::Plugin::Settings.new(Environment.default, SiteTourPlugin)
+    settings.actions = [
+        {:language => 'en', :group_name => 'test_a', :selector => 'body', :description => 'Test A1'},
+        {:language => 'en', :group_name => 'test_a', :selector => 'body', :description => 'Test A2'},
+        {:language => 'en', :group_name => 'test_b', :selector => 'body', :description => 'Test B1'},
+    ]
+    settings.save!
+
+    expects(:environment).returns(Environment.default)
+    body_ending = instance_exec(&plugin.body_ending)
+    assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A1', 1\);/, body_ending
+    assert_match /siteTourPlugin\.add\('test_a', 'body', 'Test A2', 2\);/, body_ending
+    assert_match /siteTourPlugin\.add\('test_b', 'body', 'Test B1', 1\);/, body_ending
+  end
+
 end
diff --git a/plugins/site_tour/views/tour_actions.html.erb b/plugins/site_tour/views/tour_actions.html.erb
index 5ffeaa1..c3f55c6 100644
--- a/plugins/site_tour/views/tour_actions.html.erb
+++ b/plugins/site_tour/views/tour_actions.html.erb
@@ -4,14 +4,15 @@
 <% if actions.present? %>
 <script>
   jQuery( document ).ready(function( $ ) {
-  <% actions.each_with_index do |action, index| %>
-    <%= "siteTourPlugin.add('#{j action[:group_name]}', '#{j action[:selector]}', '#{j action[:description]}', #{index + 1});" %>
-  <% end %>
-
-  <% (group_triggers||[]).each_with_index do |group, index| %>
-    <%= "siteTourPlugin.addGroupTrigger('#{j group[:group_name]}', '#{j group[:selector]}', '#{j group[:event]}');" %>
-  <% end %>
+    <% actions.group_by {|h| h[:group_name]}.each do |group, group_actions| %>
+      <% group_actions.each_with_index do |action, index| %>
+        <%= "siteTourPlugin.add('#{j action[:group_name]}', '#{j action[:selector]}', '#{j action[:description]}', #{index + 1});" %>
+      <% end %>
+    <% end %>
 
+    <% (group_triggers||[]).each_with_index do |group, index| %>
+      <%= "siteTourPlugin.addGroupTrigger('#{j group[:group_name]}', '#{j group[:selector]}', '#{j group[:event]}');" %>
+    <% end %>
   });
 </script>
 <% end %>
--
libgit2 0.21.2