Download as
Browse Code »

Commit 5e4319137f199e2aa773a020c9c8dbecd88d4402

Authored by Rodrigo Souto
1 parent 54db2305
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Fixing tests for disabled enterprise message changing

Showing 2 changed files with 1 additions and 12 deletions   Show diff stats
test/functional/profile_controller_test.rb
  Diff comments   View file @5e43191
@@ -234,7 +234,7 @@ class ProfileControllerTest < ActionController::TestCase @@ -234,7 +234,7 @@ class ProfileControllerTest < ActionController::TestCase
234 login_as(@profile.identifier) 234 login_as(@profile.identifier)
235 ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false) 235 ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
236 get :index, :profile => ent.identifier 236 get :index, :profile => ent.identifier
237 - assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise 237 + assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => /#{Environment.default.message_for_disabled_enterprise}/
238 end 238 end
239 239
240 should 'not show message for disabled enterprise to non-enterprises' do 240 should 'not show message for disabled enterprise to non-enterprises' do
test/unit/disabled_enterprise_message_block_test.rb
  Diff comments   View file @5e43191
@@ -18,17 +18,6 @@ class DisabledEnterpriseMessageBlockTest < ActiveSupport::TestCase @@ -18,17 +18,6 @@ class DisabledEnterpriseMessageBlockTest < ActiveSupport::TestCase
18 instance_eval(&block.content) 18 instance_eval(&block.content)
19 end 19 end
20 20
21 - should 'display nothing if environment has no message' do  
22 - e = fast_create(Environment)  
23 - block = DisabledEnterpriseMessageBlock.new  
24 - p = Profile.new  
25 - block.expects(:owner).returns(p)  
26 - p.expects(:environment).returns(e)  
27 -  
28 - expects(:render).with(:file => 'blocks/disabled_enterprise_message', :locals => { :message => ''})  
29 - instance_eval(&block.content)  
30 - end  
31 -  
32 should 'not be editable' do 21 should 'not be editable' do
33 assert !DisabledEnterpriseMessageBlock.new.editable? 22 assert !DisabledEnterpriseMessageBlock.new.editable?
34 end 23 end