noosfero | 4 new commits pushed to repository

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/7750bb37d186eba4f307675096600cf23ee214aa">7750bb37</a> by Junior Silva
fix comment_classification plugin

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/9f4717ef481fa3ca2fa4ef614384a943dd1c29ab">9f4717ef</a> by Junior Silva
Merge branch 'cc-plugin' of https://gitlab.com/juniorsilva1001/noosfero into cc-plugin

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/d0d55b87d1bbc336036090b5048e22e51f2f5401">d0d55b87</a> by Junior Silva
comment_classification_plugin: fix indentation and require

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/ec0f8b0e26999fd9053e52fafdd50d671a0f7f12">ec0f8b0e</a> by Bráulio Bhavamitra
Merge branch 'cc-plugin' into 'master'

cc-plugin: fix comment_classification plugin

See merge request !390

- - - - -


Changes:

=====================================
lib/tasks/plugins_tests.rake
=====================================
--- a/lib/tasks/plugins_tests.rake
+++ b/lib/tasks/plugins_tests.rake
@@ -106,7 +106,7 @@ def run_test(name, files)
   files = Array(files)
   plugin = filename2plugin(files.first)
   if name == :cucumber || name == :selenium
-    run_cucumber task2_profile(name, plugin), files
+    run_cucumber task2profile(name, plugin), files
   else
     run_testrb files
   end
@@ -134,7 +134,11 @@ end
 
 def run_tests(name, plugins, run=:all)
   plugins = Array(plugins)
-  glob =  "plugins/{#{plugins.join(',')}}/test/#{task2folder(name)}/**/*.#{task2ext(name)}"
+  if name == :cucumber || name == :selenium
+    glob =  "plugins/{#{plugins.join(',')}}/#{task2folder(name)}/**/*.#{task2ext(name)}"
+  else
+    glob =  "plugins/{#{plugins.join(',')}}/test/#{task2folder(name)}/**/*.#{task2ext(name)}"
+  end
   files = Dir.glob(glob)
   if files.empty?
     puts "I: no tests to run #{name}"

=====================================
plugins/comment_classification/features/step_definitions/plugin_steps.rb
=====================================
--- a/plugins/comment_classification/features/step_definitions/plugin_steps.rb
+++ b/plugins/comment_classification/features/step_definitions/plugin_steps.rb
@@ -1,9 +1,12 @@
 Given /^CommentClassificationPlugin is enabled$/ do
-  step %{I am logged in as admin}
-  step %{I am on the environment control panel}
-  step %{I follow "Plugins"}
-  step %{I check "Comment Classification"}
-  step %{I press "Save changes"}
+  steps %Q{
+    Given I am logged in as admin
+    Given I am on the environment control panel
+    Given I follow "Plugins"
+    Given I check "Comment Classification"
+    Given I press "Save changes"
+  }
+
   Environment.default.enabled_plugins.should include("CommentClassificationPlugin")
 end
 

=====================================
plugins/comment_classification/lib/ext/comment.rb
=====================================
--- a/plugins/comment_classification/lib/ext/comment.rb
+++ b/plugins/comment_classification/lib/ext/comment.rb
@@ -1,6 +1,4 @@
 require_dependency 'comment'
-require 'comment_classification_plugin.rb'
-require 'comment_classification_plugin/label.rb'
 
 class Comment
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150224/8c349e61/attachment.html>