Download as
Browse Code »

Commit db3c325949e32307ba420f8a6a7f93c17c09a335

Authored by Antonio Terceiro
1 parent 18329cab
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: Rails.root is not a string anymore

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
test/unit/layout_template_test.rb
  Diff comments   View file @db3c325
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper' @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
3 class LayoutTemplateTest < ActiveSupport::TestCase 3 class LayoutTemplateTest < ActiveSupport::TestCase
4 4
5 should 'read configuration' do 5 should 'read configuration' do
6 - YAML.expects(:load_file).with(Rails.root + '/public/designs/templates/default/config.yml').returns({'number_of_boxes' => 3, 'description' => 'my description', 'title' => 'my title'}) 6 + YAML.expects(:load_file).with(File.join(Rails.root, 'public/designs/templates/default/config.yml')).returns({'number_of_boxes' => 3, 'description' => 'my description', 'title' => 'my title'})
7 t = LayoutTemplate.find('default') 7 t = LayoutTemplate.find('default')
8 assert_equal 3, t.number_of_boxes 8 assert_equal 3, t.number_of_boxes
9 assert_equal 'my description', t.description 9 assert_equal 'my description', t.description
@@ -11,9 +11,9 @@ class LayoutTemplateTest &lt; ActiveSupport::TestCase @@ -11,9 +11,9 @@ class LayoutTemplateTest &lt; ActiveSupport::TestCase
11 end 11 end
12 12
13 should 'list all' do 13 should 'list all' do
14 - Dir.expects(:glob).with(Rails.root + '/public/designs/templates/*').returns([Rails.root + '/public/designs/templates/one', Rails.root + '/public/designs/templates/two'])  
15 - YAML.expects(:load_file).with(Rails.root + '/public/designs/templates/one/config.yml').returns({})  
16 - YAML.expects(:load_file).with(Rails.root + '/public/designs/templates/two/config.yml').returns({}) 14 + Dir.expects(:glob).with(File.join(Rails.root, 'public/designs/templates/*')).returns([File.join(Rails.root, 'public/designs/templates/one'), File.join(Rails.root, 'public/designs/templates/two')])
  15 + YAML.expects(:load_file).with(File.join(Rails.root, 'public/designs/templates/one/config.yml')).returns({})
  16 + YAML.expects(:load_file).with(File.join(Rails.root, 'public/designs/templates/two/config.yml')).returns({})
17 17
18 all = LayoutTemplate.all 18 all = LayoutTemplate.all
19 assert_equivalent [ 'one', 'two' ], all.map(&:id) 19 assert_equivalent [ 'one', 'two' ], all.map(&:id)