Download as
Browse Code »

Commit 6630bb1aadb259264ce311d278ff32727568c8b6

Authored by Weblate
2 parents aafd5998 11dfb86b
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge remote-tracking branch 'origin/master'

Showing 4 changed files with 22 additions and 9 deletions   Show diff stats
db/schema.rb
  Diff comments   View file @6630bb1
... ... @@ -241,6 +241,14 @@ ActiveRecord::Schema.define(:version => 20150122165042) do
241 241 t.datetime "updated_at"
242 242 end
243 243  
  244 + create_table "chat_messages", :force => true do |t|
  245 + t.integer "to_id"
  246 + t.integer "from_id"
  247 + t.string "body"
  248 + t.datetime "created_at", :null => false
  249 + t.datetime "updated_at", :null => false
  250 + end
  251 +
244 252 create_table "comments", :force => true do |t|
245 253 t.string "title"
246 254 t.text "body"
... ...
lib/tasks/plugins_tests.rake
  Diff comments   View file @6630bb1
... ... @@ -106,7 +106,7 @@ def run_test(name, files)
106 106 files = Array(files)
107 107 plugin = filename2plugin(files.first)
108 108 if name == :cucumber || name == :selenium
109   - run_cucumber task2_profile(name, plugin), files
  109 + run_cucumber task2profile(name, plugin), files
110 110 else
111 111 run_testrb files
112 112 end
... ... @@ -134,7 +134,11 @@ end
134 134  
135 135 def run_tests(name, plugins, run=:all)
136 136 plugins = Array(plugins)
137   - glob = "plugins/{#{plugins.join(',')}}/test/#{task2folder(name)}/**/*.#{task2ext(name)}"
  137 + if name == :cucumber || name == :selenium
  138 + glob = "plugins/{#{plugins.join(',')}}/#{task2folder(name)}/**/*.#{task2ext(name)}"
  139 + else
  140 + glob = "plugins/{#{plugins.join(',')}}/test/#{task2folder(name)}/**/*.#{task2ext(name)}"
  141 + end
138 142 files = Dir.glob(glob)
139 143 if files.empty?
140 144 puts "I: no tests to run #{name}"
... ...
plugins/comment_classification/features/step_definitions/plugin_steps.rb
  Diff comments   View file @6630bb1
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/ext/comment.rb
  Diff comments   View file @6630bb1
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  
... ...