From 24cf091ded1d90b08a99dc3de7f31d6e47f337d6 Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Tue, 13 May 2014 19:57:25 -0300
Subject: [PATCH] Fixing google cse tests

---
 lib/noosfero/plugin/manager.rb                                 |  5 ++---
 plugins/google_cse/controllers/google_cse_plugin_controller.rb |  2 ++
 plugins/google_cse/views/google_cse_plugin/results.html.erb    | 30 ++++++++++++++++++++++++++++++
 plugins/google_cse/views/google_cse_plugin/results.rhtml       | 30 ------------------------------
 4 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 plugins/google_cse/views/google_cse_plugin/results.html.erb
 delete mode 100644 plugins/google_cse/views/google_cse_plugin/results.rhtml

diff --git a/lib/noosfero/plugin/manager.rb b/lib/noosfero/plugin/manager.rb
index d807898..322818d 100644
--- a/lib/noosfero/plugin/manager.rb
+++ b/lib/noosfero/plugin/manager.rb
@@ -90,10 +90,9 @@ class Noosfero::Plugin::Manager
     end
   end
 
-  def [](name)
-    klass = Noosfero::Plugin.klass(name)
+  def [](class_name)
     enabled_plugins.select do |plugin|
-      plugin.kind_of?(klass)
+      plugin.kind_of?(class_name.constantize)
     end.first
   end
 
diff --git a/plugins/google_cse/controllers/google_cse_plugin_controller.rb b/plugins/google_cse/controllers/google_cse_plugin_controller.rb
index 28de1bc..8d605be 100644
--- a/plugins/google_cse/controllers/google_cse_plugin_controller.rb
+++ b/plugins/google_cse/controllers/google_cse_plugin_controller.rb
@@ -1,4 +1,6 @@
 class GoogleCsePluginController < ApplicationController
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
   no_design_blocks
+
+  def results; end
 end
diff --git a/plugins/google_cse/views/google_cse_plugin/results.html.erb b/plugins/google_cse/views/google_cse_plugin/results.html.erb
new file mode 100644
index 0000000..e31f387
--- /dev/null
+++ b/plugins/google_cse/views/google_cse_plugin/results.html.erb
@@ -0,0 +1,30 @@
+<% plugin = @plugins['GoogleCsePlugin'] %>
+<div id="cse" style="width: 100%;"><%= _('Loading') %></div>
+<script src="//www.google.com/jsapi" type="text/javascript"></script>
+<script type="text/javascript">
+  function parseQueryFromUrl () {
+    var queryParamName = "q";
+    var search = window.location.search.substr(1);
+    var parts = search.split('&');
+    for (var i = 0; i < parts.length; i++) {
+      var keyvaluepair = parts[i].split('=');
+      if (decodeURIComponent(keyvaluepair[0]) == queryParamName) {
+        return decodeURIComponent(keyvaluepair[1].replace(/\+/g, ' '));
+      }
+    }
+    return '';
+  }
+  google.load('search', '1', {style : google.loader.themes.MINIMALIST});
+  google.setOnLoadCallback(function() {
+    var customSearchControl = new google.search.CustomSearchControl(
+      '<%= plugin && plugin.google_id %>');
+    customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+    var options = new google.search.DrawOptions();
+    options.enableSearchResultsOnly();
+    customSearchControl.draw('cse', options);
+    var queryFromUrl = parseQueryFromUrl();
+    if (queryFromUrl) {
+      customSearchControl.execute(queryFromUrl);
+    }
+  }, true);
+</script>
diff --git a/plugins/google_cse/views/google_cse_plugin/results.rhtml b/plugins/google_cse/views/google_cse_plugin/results.rhtml
deleted file mode 100644
index 6090fdf..0000000
--- a/plugins/google_cse/views/google_cse_plugin/results.rhtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<% plugin = @plugins[:google_cse] %>
-<div id="cse" style="width: 100%;"><%= _('Loading') %></div>
-<script src="//www.google.com/jsapi" type="text/javascript"></script>
-<script type="text/javascript">
-  function parseQueryFromUrl () {
-    var queryParamName = "q";
-    var search = window.location.search.substr(1);
-    var parts = search.split('&');
-    for (var i = 0; i < parts.length; i++) {
-      var keyvaluepair = parts[i].split('=');
-      if (decodeURIComponent(keyvaluepair[0]) == queryParamName) {
-        return decodeURIComponent(keyvaluepair[1].replace(/\+/g, ' '));
-      }
-    }
-    return '';
-  }
-  google.load('search', '1', {style : google.loader.themes.MINIMALIST});
-  google.setOnLoadCallback(function() {
-    var customSearchControl = new google.search.CustomSearchControl(
-      '<%= plugin && plugin.google_id %>');
-    customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
-    var options = new google.search.DrawOptions();
-    options.enableSearchResultsOnly();
-    customSearchControl.draw('cse', options);
-    var queryFromUrl = parseQueryFromUrl();
-    if (queryFromUrl) {
-      customSearchControl.execute(queryFromUrl);
-    }
-  }, true);
-</script>
--
libgit2 0.21.2