Download as
Browse Code »

Commit 21a24e27110937462112a1dde0dffaef042bfdd5

Authored by Victor Costa
2 parents 490300c7 5ba67c24
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'article_display_media_panel' into production

Showing 27 changed files with 563 additions and 9 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @21a24e2
... ... @@ -645,6 +645,14 @@ class Article < ActiveRecord::Base
645 645 can_display_hits? && display_hits
646 646 end
647 647  
  648 + def display_media_panel?
  649 + can_display_media_panel? && environment.enabled?('media_panel')
  650 + end
  651 +
  652 + def can_display_media_panel?
  653 + false
  654 + end
  655 +
648 656 def image?
649 657 false
650 658 end
... ...
app/models/enterprise_homepage.rb
  Diff comments   View file @21a24e2
... ... @@ -35,4 +35,8 @@ class EnterpriseHomepage < Article
35 35 false
36 36 end
37 37  
  38 + def can_display_media_panel?
  39 + true
  40 + end
  41 +
38 42 end
... ...
app/models/event.rb
  Diff comments   View file @21a24e2
... ... @@ -135,6 +135,10 @@ class Event < Article
135 135 true
136 136 end
137 137  
  138 + def can_display_media_panel?
  139 + true
  140 + end
  141 +
138 142 include Noosfero::TranslatableContent
139 143 include MaybeAddHttp
140 144  
... ...
app/models/textile_article.rb
  Diff comments   View file @21a24e2
... ... @@ -24,6 +24,10 @@ class TextileArticle < TextArticle
24 24 true
25 25 end
26 26  
  27 + def can_display_media_panel?
  28 + true
  29 + end
  30 +
27 31 protected
28 32  
29 33 def convert_to_html(textile)
... ...
app/models/tiny_mce_article.rb
  Diff comments   View file @21a24e2
... ... @@ -28,4 +28,8 @@ class TinyMceArticle < TextArticle
28 28 true
29 29 end
30 30  
  31 + def can_display_media_panel?
  32 + true
  33 + end
  34 +
31 35 end
... ...
app/views/cms/edit.html.erb
  Diff comments   View file @21a24e2
1 1 <%= error_messages_for 'article' %>
2 2  
3   -<% show_media_panel = environment.enabled?('media_panel') && [TinyMceArticle, TextileArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
4   -
5   -<div class='<%= (show_media_panel ? 'with_media_panel' : 'no_media_panel') %>'>
  3 +<div class='<%= (@article.display_media_panel? ? 'with_media_panel' : 'no_media_panel') %>'>
6 4 <%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
7 5  
8 6 <%= hidden_field_tag("type", @type) if @type %>
... ... @@ -68,7 +66,7 @@
68 66 <% end %>
69 67 </div>
70 68  
71   -<% if show_media_panel %>
  69 +<% if @article.display_media_panel? %>
72 70 <%= render :partial => 'text_editor_sidebar' %>
73 71 <% end %>
74 72  
... ...
config/initializers/unicorn.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,8 @@
  1 +require_dependency 'scheduler/defer'
  2 +
  3 +if defined? Unicorn
  4 + ObjectSpace.each_object Unicorn::HttpServer do |s|
  5 + s.extend Scheduler::Defer::Unicorn
  6 + end
  7 +end
  8 +
... ...
lib/noosfero/scheduler/defer.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,95 @@
  1 +# based on https://github.com/discourse/discourse/blob/master/lib/scheduler/defer.rb
  2 +
  3 +module Scheduler
  4 + module Deferrable
  5 + def initialize
  6 + # FIXME: do some other way when not using Unicorn
  7 + @async = (not Rails.env.test?) and defined? Unicorn
  8 + @queue = Queue.new
  9 + @mutex = Mutex.new
  10 + @paused = false
  11 + @thread = nil
  12 + end
  13 +
  14 + def pause
  15 + stop!
  16 + @paused = true
  17 + end
  18 +
  19 + def resume
  20 + @paused = false
  21 + end
  22 +
  23 + # for test
  24 + def async= val
  25 + @async = val
  26 + end
  27 +
  28 + def later desc = nil, &blk
  29 + if @async
  30 + start_thread unless (@thread && @thread.alive?) || @paused
  31 + @queue << [blk, desc]
  32 + else
  33 + blk.call
  34 + end
  35 + end
  36 +
  37 + def stop!
  38 + @thread.kill if @thread and @thread.alive?
  39 + @thread = nil
  40 + end
  41 +
  42 + # test only
  43 + def stopped?
  44 + !(@thread and @thread.alive?)
  45 + end
  46 +
  47 + def do_all_work
  48 + while !@queue.empty?
  49 + do_work _non_block=true
  50 + end
  51 + end
  52 +
  53 + private
  54 +
  55 + def start_thread
  56 + @mutex.synchronize do
  57 + return if @thread && @thread.alive?
  58 + @thread = Thread.new do
  59 + while true
  60 + do_work
  61 + end
  62 + end
  63 + @thread.priority = -2
  64 + end
  65 + end
  66 +
  67 + # using non_block to match Ruby #deq
  68 + def do_work non_block=false
  69 + job, desc = @queue.deq non_block
  70 + begin
  71 + job.call
  72 + rescue => ex
  73 + ExceptionNotifier.notify_exception ex, message: "Running deferred code '#{desc}'"
  74 + end
  75 + rescue => ex
  76 + ExceptionNotifier.notify_exception ex, message: "Processing deferred code queue"
  77 + end
  78 + end
  79 +
  80 + class Defer
  81 +
  82 + module Unicorn
  83 + def process_client client
  84 + ::Scheduler::Defer.pause
  85 + super client
  86 + ::Scheduler::Defer.do_all_work
  87 + ::Scheduler::Defer.resume
  88 + end
  89 + end
  90 +
  91 + extend Deferrable
  92 + initialize
  93 + end
  94 +
  95 +end
... ...
plugins/analytics/controllers/profile/analytics_plugin/time_on_page_controller.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,30 @@
  1 +class AnalyticsPlugin::TimeOnPageController < ProfileController
  2 +
  3 + before_filter :skip_page_view
  4 +
  5 + def page_load
  6 + # to avoid concurrency problems with the original deferred request, also defer this
  7 + Scheduler::Defer.later do
  8 + page_view = profile.page_views.where(request_id: params[:id]).first
  9 + page_view.request = request
  10 + page_view.page_load!
  11 + end
  12 +
  13 + render nothing: true
  14 + end
  15 +
  16 + def report
  17 + page_view = profile.page_views.where(request_id: params[:id]).first
  18 + page_view.request = request
  19 + page_view.increase_time_on_page!
  20 +
  21 + render nothing: true
  22 + end
  23 +
  24 + protected
  25 +
  26 + def skip_page_view
  27 + @analytics_skip_page_view = true
  28 + end
  29 +
  30 +end
... ...
plugins/analytics/db/migrate/20150715001149_init_analytics_plugin.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,47 @@
  1 +class InitAnalyticsPlugin < ActiveRecord::Migration
  2 +
  3 + def up
  4 + create_table :analytics_plugin_visits do |t|
  5 + t.integer :profile_id
  6 + end
  7 +
  8 + create_table :analytics_plugin_page_views do |t|
  9 + t.string :type
  10 + t.integer :visit_id
  11 + t.integer :track_id
  12 + t.integer :referer_page_view_id
  13 + t.string :request_id
  14 +
  15 + t.integer :user_id
  16 + t.integer :session_id
  17 + t.integer :profile_id
  18 +
  19 + t.text :url
  20 + t.text :referer_url
  21 +
  22 + t.text :user_agent
  23 + t.string :remote_ip
  24 +
  25 + t.datetime :request_started_at
  26 + t.datetime :request_finished_at
  27 + t.datetime :page_loaded_at
  28 + t.integer :time_on_page, default: 0
  29 +
  30 + t.text :data, default: {}.to_yaml
  31 + end
  32 + add_index :analytics_plugin_page_views, :request_id
  33 + add_index :analytics_plugin_page_views, :referer_page_view_id
  34 +
  35 + add_index :analytics_plugin_page_views, :user_id
  36 + add_index :analytics_plugin_page_views, :session_id
  37 + add_index :analytics_plugin_page_views, :profile_id
  38 + add_index :analytics_plugin_page_views, :url
  39 + add_index :analytics_plugin_page_views, [:user_id, :session_id, :profile_id, :url], name: :analytics_plugin_referer_find
  40 + end
  41 +
  42 + def down
  43 + drop_table :analytics_plugin_visits
  44 + drop_table :analytics_plugin_page_views
  45 + end
  46 +
  47 +end
... ...
plugins/analytics/lib/analytics_plugin.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,15 @@
  1 +module AnalyticsPlugin
  2 +
  3 + TimeOnPageUpdateInterval = 2.minutes * 1000
  4 +
  5 + extend Noosfero::Plugin::ParentMethods
  6 +
  7 + def self.plugin_name
  8 + I18n.t'analytics_plugin.lib.plugin.name'
  9 + end
  10 +
  11 + def self.plugin_description
  12 + I18n.t'analytics_plugin.lib.plugin.description'
  13 + end
  14 +
  15 +end
... ...
plugins/analytics/lib/analytics_plugin/base.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,43 @@
  1 +
  2 +class AnalyticsPlugin::Base < Noosfero::Plugin
  3 +
  4 + def body_ending
  5 + return unless profile and profile.analytics_enabled?
  6 + lambda do
  7 + render 'analytics_plugin/body_ending'
  8 + end
  9 + end
  10 +
  11 + def js_files
  12 + ['analytics'].map{ |j| "javascripts/#{j}" }
  13 + end
  14 +
  15 + def application_controller_filters
  16 + [{
  17 + type: 'around_filter', options: {}, block: -> &block do
  18 + request_started_at = Time.now
  19 + block.call
  20 + request_finished_at = Time.now
  21 +
  22 + return if @analytics_skip_page_view
  23 + return unless profile and profile.analytics_enabled?
  24 +
  25 + Scheduler::Defer.later 'analytics: register page view' do
  26 + page_view = profile.page_views.build request: request, profile_id: profile,
  27 + request_started_at: request_started_at, request_finished_at: request_finished_at
  28 +
  29 + unless profile.analytics_anonymous?
  30 + # FIXME: use session.id in Rails 4
  31 + session_id = Marshal.load(Base64.decode64 request['_session_id'])['session_id'] rescue nil
  32 + #session_id = request.session_options[:id]
  33 + page_view.user = user
  34 + page_view.session_id = session_id
  35 + end
  36 +
  37 + page_view.save!
  38 + end
  39 + end,
  40 + }]
  41 + end
  42 +
  43 +end
... ...
plugins/analytics/lib/ext/profile.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,30 @@
  1 +require_dependency 'profile'
  2 +require_dependency 'community'
  3 +
  4 +([Profile] + Profile.descendants).each do |subclass|
  5 +subclass.class_eval do
  6 +
  7 + has_many :visits, foreign_key: :profile_id, class_name: 'AnalyticsPlugin::Visit'
  8 + has_many :page_views, foreign_key: :profile_id, class_name: 'AnalyticsPlugin::PageView'
  9 +
  10 +end
  11 +end
  12 +
  13 +class Profile
  14 +
  15 + def analytics_settings attrs = {}
  16 + @analytics_settings ||= Noosfero::Plugin::Settings.new self, AnalyticsPlugin, attrs
  17 + attrs.each{ |a, v| @analytics_settings.send "#{a}=", v }
  18 + @analytics_settings
  19 + end
  20 + alias_method :analytics_settings=, :analytics_settings
  21 +
  22 + def analytics_enabled?
  23 + self.analytics_settings.enabled
  24 + end
  25 +
  26 + def analytics_anonymous?
  27 + self.analytics_settings.anonymous
  28 + end
  29 +
  30 +end
... ...
plugins/analytics/locales/en.yml 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,11 @@
  1 +
  2 +en: &en
  3 + analytics_plugin:
  4 + lib:
  5 + plugin:
  6 + name: 'Access tracking'
  7 + description: 'Register the access of selected profiles'
  8 +
  9 +en-US:
  10 + <<: *en
  11 +
... ...
plugins/analytics/locales/pt.yml 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,10 @@
  1 +
  2 +pt: &pt
  3 + analytics_plugin:
  4 + lib:
  5 + plugin:
  6 + name: 'Rastreio de accesso'
  7 + description: 'Registra o acesso de perfis selecionados'
  8 +
  9 +pt-BR:
  10 + <<: *pt
... ...
plugins/analytics/models/analytics_plugin/page_view.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,67 @@
  1 +class AnalyticsPlugin::PageView < ActiveRecord::Base
  2 +
  3 + serialize :data
  4 +
  5 + attr_accessible *self.column_names
  6 + attr_accessible :user, :profile
  7 +
  8 + attr_accessor :request
  9 + attr_accessible :request
  10 +
  11 + acts_as_having_settings field: :options
  12 +
  13 + belongs_to :visit, class_name: 'AnalyticsPlugin::Visit'
  14 + belongs_to :referer_page_view, class_name: 'AnalyticsPlugin::PageView'
  15 +
  16 + belongs_to :user, class_name: 'Person'
  17 + belongs_to :session, primary_key: :session_id, foreign_key: :session_id, class_name: 'Session'
  18 + belongs_to :profile
  19 +
  20 + validates_presence_of :visit
  21 + validates_presence_of :request, on: :create
  22 + validates_presence_of :url
  23 +
  24 + before_validation :extract_request_data, on: :create
  25 + before_validation :fill_referer_page_view, on: :create
  26 + before_validation :fill_visit, on: :create
  27 +
  28 + def request_duration
  29 + self.request_finished_at - self.request_started_at
  30 + end
  31 +
  32 + def page_load!
  33 + self.page_loaded_at = Time.now
  34 + self.update_column :page_loaded_at, self.page_loaded_at
  35 + end
  36 +
  37 + def increase_time_on_page!
  38 + now = Time.now
  39 + initial_time = self.page_loaded_at || self.request_finished_at
  40 + return unless now > initial_time
  41 +
  42 + self.time_on_page = now - initial_time
  43 + self.update_column :time_on_page, self.time_on_page
  44 + end
  45 +
  46 + protected
  47 +
  48 + def extract_request_data
  49 + self.url = self.request.url.sub /\/+$/, ''
  50 + self.referer_url = self.request.referer
  51 + self.user_agent = self.request.headers['User-Agent']
  52 + self.request_id = self.request.env['action_dispatch.request_id']
  53 + self.remote_ip = self.request.remote_ip
  54 + end
  55 +
  56 + def fill_referer_page_view
  57 + self.referer_page_view = AnalyticsPlugin::PageView.order('request_started_at DESC').
  58 + where(url: self.referer_url, session_id: self.session_id, user_id: self.user_id, profile_id: self.profile_id).first if self.referer_url.present?
  59 + end
  60 +
  61 + def fill_visit
  62 + self.visit = self.referer_page_view.visit if self.referer_page_view
  63 + self.visit ||= AnalyticsPlugin::Visit.new profile: profile
  64 + end
  65 +
  66 +end
  67 +
... ...
plugins/analytics/models/analytics_plugin/visit.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,11 @@
  1 +class AnalyticsPlugin::Visit < ActiveRecord::Base
  2 +
  3 + attr_accessible *self.column_names
  4 + attr_accessible :profile
  5 +
  6 + default_scope -> { includes :page_views }
  7 +
  8 + belongs_to :profile
  9 + has_many :page_views, class_name: 'AnalyticsPlugin::PageView', dependent: :destroy
  10 +
  11 +end
... ...
plugins/analytics/po/pt/analytics.po 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,29 @@
  1 +# translation of analytic.po to portuguese
  2 +# Krishnamurti Lelis Lima Vieira Nunes <krishna@colivre.coop.br>, 2007.
  3 +# noosfero - Brazilian Portuguese translation
  4 +# Copyright (C) 2007,
  5 +# Forum Brasileiro de Economia Solidaria <http://www.fbes.org.br/>
  6 +# Copyright (C) 2007,
  7 +# Ynternet.org Foundation <http://www.ynternet.org/>
  8 +# This file is distributed under the same license as noosfero itself.
  9 +# Joenio Costa <joenio@colivre.coop.br>, 2008.
  10 +#
  11 +#
  12 +msgid ""
  13 +msgstr ""
  14 +"Project-Id-Version: 1.0-690-gcb6e853\n"
  15 +"POT-Creation-Date: 2015-03-05 12:10-0300\n"
  16 +"PO-Revision-Date: 2015-07-21 09:23-0300\n"
  17 +"Last-Translator: Michal Čihař <michal@cihar.com>\n"
  18 +"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
  19 +"/plugin-solr/pt/>\n"
  20 +"Language: pt\n"
  21 +"MIME-Version: 1.0\n"
  22 +"Content-Type: text/plain; charset=UTF-8\n"
  23 +"Content-Transfer-Encoding: 8bit\n"
  24 +"Plural-Forms: nplurals=2; plural=n != 1;\n"
  25 +"X-Generator: Weblate 2.3-dev\n"
  26 +
  27 +msgid "Select the set of communities and users to track"
  28 +msgstr "Seleciona o conjunto de comunidades e usuários para rastrear"
  29 +
... ...
plugins/analytics/public/javascripts/analytics.js 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,39 @@
  1 +analytics = {
  2 + requestId: '',
  3 +
  4 + timeOnPage: {
  5 + updateInterval: 0,
  6 + baseUrl: '',
  7 +
  8 + report: function() {
  9 + $.ajax(analytics.timeOnPage.baseUrl+'/report', {
  10 + type: 'POST', data: {id: analytics.requestId},
  11 + success: function(data) {
  12 +
  13 + analytics.timeOnPage.poll()
  14 + },
  15 + })
  16 + },
  17 +
  18 + poll: function() {
  19 + if (analytics.timeOnPage.updateInterval)
  20 + setTimeout(analytics.timeOnPage.report, analytics.timeOnPage.updateInterval)
  21 + },
  22 + },
  23 +
  24 + init: function() {
  25 + analytics.timeOnPage.poll()
  26 + },
  27 +
  28 + pageLoad: function() {
  29 + $.ajax(analytics.timeOnPage.baseUrl+'/page_load', {
  30 + type: 'POST', data: {id: analytics.requestId},
  31 + success: function(data) {
  32 + },
  33 + });
  34 + }
  35 +
  36 +};
  37 +
  38 +$(document).ready(analytics.pageLoad)
  39 +
... ...
plugins/analytics/test/functional/content_viewer_controller_test.rb 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,48 @@
  1 +require 'test_helper'
  2 +require 'content_viewer_controller'
  3 +
  4 +class ContentViewerControllerTest < ActionController::TestCase
  5 +
  6 + def setup
  7 + @controller = ContentViewerController.new
  8 + @request = ActionController::TestRequest.new
  9 + @response = ActionController::TestResponse.new
  10 +
  11 + @environment = Environment.default
  12 + @environment.enabled_plugins += ['AnalyticsPlugin']
  13 + @environment.save!
  14 +
  15 + @user = create_user('testinguser').person
  16 + login_as @user.identifier
  17 +
  18 + @community = build Community, identifier: 'testcomm', name: 'test'
  19 + @community.analytics_settings.enabled = true
  20 + @community.analytics_settings.anonymous = false
  21 + @community.save!
  22 + @community.add_member @user
  23 + end
  24 +
  25 + should 'register page view correctly' do
  26 + @request.env['HTTP_REFERER'] = 'http://google.com'
  27 + first_url = 'http://test.host'
  28 + get :view_page, profile: @community.identifier, page: []
  29 + assert_equal 1, @community.page_views.count
  30 + assert_equal 1, @community.visits.count
  31 +
  32 + first_page_view = @community.page_views.order(:id).first
  33 + assert_equal @request.referer, first_page_view.referer_url
  34 +
  35 + @request.env['HTTP_REFERER'] = first_url
  36 + get :view_page, profile: @community.identifier, page: @community.articles.last.path.split('/')
  37 + assert_equal 2, @community.page_views.count
  38 + assert_equal 1, @community.visits.count
  39 +
  40 + second_page_view = @community.page_views.order(:id).last
  41 + assert_equal first_page_view, second_page_view.referer_page_view
  42 +
  43 + assert_equal @user, second_page_view.user
  44 +
  45 + assert second_page_view.request_duration > 0 and second_page_view.request_duration < 1
  46 + end
  47 +
  48 +end
... ...
plugins/analytics/views/analytics_plugin/_body_ending.html.slim 0 → 100644
  Diff comments   View file @21a24e2
... ... @@ -0,0 +1,6 @@
  1 +javascript:
  2 + analytics.timeOnPage.baseUrl = #{url_for(controller: 'analytics_plugin/time_on_page').to_json}
  3 + analytics.timeOnPage.updateInterval = #{AnalyticsPlugin::TimeOnPageUpdateInterval.to_json}
  4 + analytics.requestId = #{request.env['action_dispatch.request_id'].to_json}
  5 + analytics.init()
  6 +
... ...
plugins/sub_organizations/features/sub_organizations_block.feature
  Diff comments   View file @21a24e2
... ... @@ -11,7 +11,7 @@ Feature: related_organizations_block
11 11 And the following community
12 12 | identifier | name | owner |
13 13 | springfield | Springfield | homer |
14   - | moe | Moe's | homer |
  14 + | moe | Moe | homer |
15 15 And the following enterprise
16 16 | identifier | name | owner |
17 17 | duff | Duff | homer |
... ... @@ -30,7 +30,7 @@ Feature: related_organizations_block
30 30 And I follow "Add a block"
31 31 And I choose "Related Organizations"
32 32 And I press "Add"
33   - Then I should see "Moe's" within ".related-organizations-block"
  33 + Then I should see "Moe" within ".related-organizations-block"
34 34 And I should see "Duff" within ".related-organizations-block"
35 35  
36 36 Scenario: display only sub-communities
... ... @@ -41,12 +41,12 @@ Feature: related_organizations_block
41 41 And I follow "Edit" within ".related-organizations-block"
42 42 And I select "Community" from "block_organization_type"
43 43 And I press "Save"
44   - Then I should see "Moe's" within ".related-organizations-block"
  44 + Then I should see "Moe" within ".related-organizations-block"
45 45 And I should not see "Duff" within ".related-organizations-block"
46 46  
47 47 Scenario: display both sub types on sub-organizations page
48 48 When I go to springfield's "children" page from "SubOrganizationsPluginProfileController" of "SubOrganizations" plugin
49   - Then I should see "Moe's"
  49 + Then I should see "Moe"
50 50 And I should see "Duff"
51 51  
52 52 Scenario: display only sub-communities on sub-organizations page
... ... @@ -58,5 +58,5 @@ Feature: related_organizations_block
58 58 And I select "Community" from "block_organization_type"
59 59 And I press "Save"
60 60 And I follow "View all" within ".related-organizations-block"
61   - Then I should see "Moe's" within ".profile-list"
  61 + Then I should see "Moe" within ".profile-list"
62 62 And I should not see "Duff" within ".profile-list"
... ...
test/unit/article_test.rb
  Diff comments   View file @21a24e2
... ... @@ -2191,4 +2191,27 @@ class ArticleTest &lt; ActiveSupport::TestCase
2191 2191 article.destroy
2192 2192 end
2193 2193  
  2194 + should 'have can_display_media_panel with default false' do
  2195 + a = Article.new
  2196 + assert !a.can_display_media_panel?
  2197 + end
  2198 +
  2199 + should 'display media panel when allowed by the environment' do
  2200 + a = Article.new
  2201 + a.expects(:can_display_media_panel?).returns(true)
  2202 + environment = mock
  2203 + a.expects(:environment).returns(environment)
  2204 + environment.expects(:enabled?).with('media_panel').returns(true)
  2205 + assert a.display_media_panel?
  2206 + end
  2207 +
  2208 + should 'not display media panel when not allowed by the environment' do
  2209 + a = Article.new
  2210 + a.expects(:can_display_media_panel?).returns(true)
  2211 + environment = mock
  2212 + a.expects(:environment).returns(environment)
  2213 + environment.expects(:enabled?).with('media_panel').returns(false)
  2214 + assert !a.display_media_panel?
  2215 + end
  2216 +
2194 2217 end
... ...
test/unit/enterprise_homepage_test.rb
  Diff comments   View file @21a24e2
... ... @@ -26,4 +26,9 @@ class EnterpriseHomepageTest &lt; ActiveSupport::TestCase
26 26 assert_equal false, a.can_display_hits?
27 27 end
28 28  
  29 + should 'have can_display_media_panel with default true' do
  30 + a = EnterpriseHomepage.new
  31 + assert a.can_display_media_panel?
  32 + end
  33 +
29 34 end
... ...
test/unit/event_test.rb
  Diff comments   View file @21a24e2
... ... @@ -357,4 +357,9 @@ class EventTest &lt; ActiveSupport::TestCase
357 357 assert event.translatable?
358 358 end
359 359  
  360 + should 'have can_display_media_panel with default true' do
  361 + a = Event.new
  362 + assert a.can_display_media_panel?
  363 + end
  364 +
360 365 end
... ...
test/unit/textile_article_test.rb
  Diff comments   View file @21a24e2
... ... @@ -175,6 +175,11 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
175 175 assert_equal "<p>one\nparagraph</p>", build_article("one\nparagraph").to_html
176 176 end
177 177  
  178 + should 'have can_display_media_panel with default true' do
  179 + a = TextileArticle.new
  180 + assert a.can_display_media_panel?
  181 + end
  182 +
178 183 protected
179 184  
180 185 def build_article(input = nil, options = {})
... ...
test/unit/tiny_mce_article_test.rb
  Diff comments   View file @21a24e2
... ... @@ -235,4 +235,9 @@ end
235 235 :attributes => { :colspan => 2, :rowspan => 3 }
236 236 end
237 237  
  238 + should 'have can_display_media_panel with default true' do
  239 + a = TinyMceArticle.new
  240 + assert a.can_display_media_panel?
  241 + end
  242 +
238 243 end
... ...