Download as
Browse Code »

Commit ef9223d051893b9dbb3cb9114604ff8182a87867

Authored by Weblate
2 parents bb2d88cf c717cb2c
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 2 changed files with 3 additions and 16 deletions   Show diff stats
test/unit/application_helper_test.rb
  Diff comments   View file @ef9223d
... ... @@ -636,21 +636,6 @@ class ApplicationHelperTest < ActionView::TestCase
636 636 assert_equal '/designs/themes/new-theme/favicon.ico', theme_favicon
637 637 end
638 638  
639   - should 'include item in usermenu for environment enabled features' do
640   - env = fast_create(Environment)
641   - env.enable('xmpp_chat', false)
642   - stubs(:environment).returns(env)
643   -
644   - @controller = ApplicationController.new
645   - path = Rails.root.join('app', 'views')
646   - @controller.stubs(:view_paths).returns([path])
647   -
648   - file = path.join('shared','usermenu', 'xmpp_chat.html.erb')
649   - expects(:render).with(:file => file, :use_full_path => false).returns('Open chat')
650   -
651   - assert_equal 'Open chat', render_environment_features(:usermenu)
652   - end
653   -
654 639 should 'not inlude administration link if user is not an environment administrator' do
655 640 user = mock()
656 641 stubs(:environment).returns(Environment.default)
... ...
test/unit/chat_helper_test.rb
  Diff comments   View file @ef9223d
1 1 require_relative "../test_helper"
2 2  
3   -class ChatHelperTest < ActiveSupport::TestCase
  3 +class ChatHelperTest < ActionView::TestCase
4 4  
  5 + include ApplicationHelper
5 6 include ChatHelper
6 7  
7 8 should 'provide menu to change chat presence status' do
8 9 env = Environment.default
9 10 stubs(:environment).returns(env)
  11 + stubs(:profile).returns(nil)
10 12 stubs(:user).returns(create_user('testing').person)
11 13 links = user_status_menu('fake-class', 'offline')
12 14 assert_match /Online/, links
... ...