Download as
Browse Code »

Commit 9f4717ef481fa3ca2fa4ef614384a943dd1c29ab

Authored by Junior Silva
2 parents 90f4f1c1 7750bb37
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'cc-plugin' of https://gitlab.com/juniorsilva1001/noosfero into cc-plugin

Showing 4 changed files with 13 additions and 10 deletions   Show diff stats
lib/tasks/plugins_tests.rake
  Diff comments   View file @9f4717e
... ... @@ -105,7 +105,7 @@ def run_test(name, files)
105 105 files = Array(files)
106 106 plugin = filename2plugin(files.first)
107 107 if name == :cucumber || name == :selenium
108   - run_cucumber task2_profile(name, plugin), files
  108 + run_cucumber task2profile(name, plugin), files
109 109 else
110 110 run_testrb files
111 111 end
... ... @@ -133,7 +133,11 @@ end
133 133  
134 134 def run_tests(name, plugins, run=:all)
135 135 plugins = Array(plugins)
  136 + if name == :cucumber || name == :selenium
  137 + glob = "plugins/{#{plugins.join(',')}}/#{task2folder(name)}/**/*.#{task2ext(name)}"
  138 + else
136 139 glob = "plugins/{#{plugins.join(',')}}/test/#{task2folder(name)}/**/*.#{task2ext(name)}"
  140 + end
137 141 files = Dir.glob(glob)
138 142 if files.empty?
139 143 puts "I: no tests to run #{name}"
... ...
plugins/comment_classification/features/step_definitions/plugin_steps.rb
  Diff comments   View file @9f4717e
1 1 Given /^CommentClassificationPlugin is enabled$/ do
2   - step %{I am logged in as admin}
3   - step %{I am on the environment control panel}
4   - step %{I follow "Plugins"}
5   - step %{I check "Comment Classification"}
6   - step %{I press "Save changes"}
  2 + steps %Q{
  3 + Given I am logged in as admin
  4 + Given I am on the environment control panel
  5 + Given I follow "Plugins"
  6 + Given I check "Comment Classification"
  7 + Given I press "Save changes"
  8 + }
  9 +
7 10 Environment.default.enabled_plugins.should include("CommentClassificationPlugin")
8 11 end
9 12  
... ...
plugins/comment_classification/lib/comment_classification_plugin.rb
  Diff comments   View file @9f4717e
1   -require 'ext/environment'
2   -require 'ext/comment'
3 1  
4 2 class CommentClassificationPlugin < Noosfero::Plugin
5 3  
... ...
plugins/comment_classification/lib/ext/comment.rb
  Diff comments   View file @9f4717e
1 1 require_dependency 'comment'
2   -require 'comment_classification_plugin.rb'
3   -require 'comment_classification_plugin/label.rb'
4 2  
5 3 class Comment
6 4  
... ...