From 06d5c8c65f8d0611f7342dd448d3887d074efd07 Mon Sep 17 00:00:00 2001 From: Larissa Reis Date: Fri, 13 Jun 2014 23:20:46 -0300 Subject: [PATCH] stoa-plugin-tests: fixes config.yml loading path --- plugins/stoa/lib/stoa_plugin/usp_user.rb | 2 +- plugins/stoa/test/functional/account_controller_test.rb | 2 +- plugins/stoa/test/functional/profile_editor_controller_test.rb | 2 +- plugins/stoa/test/unit/usp_user_test.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/stoa/lib/stoa_plugin/usp_user.rb b/plugins/stoa/lib/stoa_plugin/usp_user.rb index ff11238..a1c93df 100644 --- a/plugins/stoa/lib/stoa_plugin/usp_user.rb +++ b/plugins/stoa/lib/stoa_plugin/usp_user.rb @@ -3,7 +3,7 @@ class StoaPlugin::UspUser < ActiveRecord::Base establish_connection(:stoa) set_table_name('pessoa') - SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt'] + SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt'] alias_attribute :cpf, :numcpf alias_attribute :birth_date, :dtanas diff --git a/plugins/stoa/test/functional/account_controller_test.rb b/plugins/stoa/test/functional/account_controller_test.rb index 72264fc..6c603e9 100644 --- a/plugins/stoa/test/functional/account_controller_test.rb +++ b/plugins/stoa/test/functional/account_controller_test.rb @@ -6,7 +6,7 @@ class AccountController; def rescue_action(e) raise e end; end class AccountControllerTest < ActionController::TestCase - SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt'] + SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt'] def setup @controller = AccountController.new diff --git a/plugins/stoa/test/functional/profile_editor_controller_test.rb b/plugins/stoa/test/functional/profile_editor_controller_test.rb index f4e4605..986e049 100644 --- a/plugins/stoa/test/functional/profile_editor_controller_test.rb +++ b/plugins/stoa/test/functional/profile_editor_controller_test.rb @@ -6,7 +6,7 @@ class ProfileEditorController; def rescue_action(e) raise e end; end class StoaPluginProfileEditorControllerTest < ActionController::TestCase - SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt'] + SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt'] def setup @controller = ProfileEditorController.new diff --git a/plugins/stoa/test/unit/usp_user_test.rb b/plugins/stoa/test/unit/usp_user_test.rb index e4a9481..288648b 100644 --- a/plugins/stoa/test/unit/usp_user_test.rb +++ b/plugins/stoa/test/unit/usp_user_test.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper' class StoaPlugin::UspUserTest < ActiveSupport::TestCase - SALT=YAML::load(File.open(StoaPlugin.root_path + '/config.yml'))['salt'] + SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt'] def setup @db = Tempfile.new('stoa-test') -- libgit2 0.21.2