Merge remote-tracking branch 'origin/master'

Weblate
2 parents bb2d88cf c717cb2c
Showing 2 changed files with 3 additions and 16 deletions Show diff stats
test/unit/application_helper_test.rb
test/unit/chat_helper_test.rb
@@ -636,21 +636,6 @@ class ApplicationHelperTest &lt; ActionView::TestCase
     assert_equal '/designs/themes/new-theme/favicon.ico', theme_favicon
   end
-  should 'include item in usermenu for environment enabled features' do
-    env = fast_create(Environment)
-    env.enable('xmpp_chat', false)
-    stubs(:environment).returns(env)
-
-    @controller = ApplicationController.new
-    path = Rails.root.join('app', 'views')
-    @controller.stubs(:view_paths).returns([path])
-
-    file = path.join('shared','usermenu', 'xmpp_chat.html.erb')
-    expects(:render).with(:file => file, :use_full_path => false).returns('Open chat')
-
-    assert_equal 'Open chat', render_environment_features(:usermenu)
-  end
-
   should 'not inlude administration link if user is not an environment administrator' do
     user = mock()
     stubs(:environment).returns(Environment.default)
 require_relative "../test_helper"
-class ChatHelperTest < ActiveSupport::TestCase
+class ChatHelperTest < ActionView::TestCase
+  include ApplicationHelper
   include ChatHelper
   should 'provide menu to change chat presence status' do
     env = Environment.default
     stubs(:environment).returns(env)
+    stubs(:profile).returns(nil)
     stubs(:user).returns(create_user('testing').person)
     links = user_status_menu('fake-class', 'offline')
     assert_match /Online/, links
	@@ -636,21 +636,6 @@ class ApplicationHelperTest < ActionView::TestCase		@@ -636,21 +636,6 @@ class ApplicationHelperTest < ActionView::TestCase
636	assert_equal '/designs/themes/new-theme/favicon.ico', theme_favicon	636	assert_equal '/designs/themes/new-theme/favicon.ico', theme_favicon
637	end	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	should 'not inlude administration link if user is not an environment administrator' do	639	should 'not inlude administration link if user is not an environment administrator' do
655	user = mock()	640	user = mock()
656	stubs(:environment).returns(Environment.default)	641	stubs(:environment).returns(Environment.default)