Download as
Browse Code »

Commit 06d5c8c65f8d0611f7342dd448d3887d074efd07

Authored by Larissa Reis
1 parent 11eaf495
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

stoa-plugin-tests: fixes config.yml loading path 

  Appending with Pathname#+ caused the File.open to search for the
  config file in '/config.yml' instead of
  StoaPlugin.root_path/config.yml, throwing a "No such file or directory"
  error. This patch fixes that error.
Showing 4 changed files with 4 additions and 4 deletions   Show diff stats
plugins/stoa/lib/stoa_plugin/usp_user.rb
  Diff comments   View file @06d5c8c
@@ -3,7 +3,7 @@ class StoaPlugin::UspUser < ActiveRecord::Base @@ -3,7 +3,7 @@ class StoaPlugin::UspUser < ActiveRecord::Base
3 establish_connection(:stoa) 3 establish_connection(:stoa)
4 set_table_name('pessoa') 4 set_table_name('pessoa')
5 5
6 - SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt'] 6 + SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
7 7
8 alias_attribute :cpf, :numcpf 8 alias_attribute :cpf, :numcpf
9 alias_attribute :birth_date, :dtanas 9 alias_attribute :birth_date, :dtanas
plugins/stoa/test/functional/account_controller_test.rb
  Diff comments   View file @06d5c8c
@@ -6,7 +6,7 @@ class AccountController; def rescue_action(e) raise e end; end @@ -6,7 +6,7 @@ class AccountController; def rescue_action(e) raise e end; end
6 6
7 class AccountControllerTest < ActionController::TestCase 7 class AccountControllerTest < ActionController::TestCase
8 8
9 - SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt'] 9 + SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
10 10
11 def setup 11 def setup
12 @controller = AccountController.new 12 @controller = AccountController.new
plugins/stoa/test/functional/profile_editor_controller_test.rb
  Diff comments   View file @06d5c8c
@@ -6,7 +6,7 @@ class ProfileEditorController; def rescue_action(e) raise e end; end @@ -6,7 +6,7 @@ class ProfileEditorController; def rescue_action(e) raise e end; end
6 6
7 class StoaPluginProfileEditorControllerTest < ActionController::TestCase 7 class StoaPluginProfileEditorControllerTest < ActionController::TestCase
8 8
9 - SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt'] 9 + SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
10 10
11 def setup 11 def setup
12 @controller = ProfileEditorController.new 12 @controller = ProfileEditorController.new
plugins/stoa/test/unit/usp_user_test.rb
  Diff comments   View file @06d5c8c
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39; @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
2 2
3 class StoaPlugin::UspUserTest < ActiveSupport::TestCase 3 class StoaPlugin::UspUserTest < ActiveSupport::TestCase
4 4
5 - SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt'] 5 + SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
6 6
7 def setup 7 def setup
8 @db = Tempfile.new('stoa-test') 8 @db = Tempfile.new('stoa-test')