[Git][noosfero/noosfero][master] 2 commits: stoa: fix eager load with custom database

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
00b90be2 by Braulio Bhavamitra at 2017-03-15T15:52:08-03:00
stoa: fix eager load with custom database

- - - - -
af040d4c by Braulio Bhavamitra at 2017-03-15T15:53:26-03:00
suppliers: remove broken link

- - - - -


6 changed files:

- plugins/stoa/lib/stoa_plugin/usp_aluno_turma_grad.rb
- plugins/stoa/lib/stoa_plugin/usp_user.rb
- plugins/stoa/test/functional/account_controller_test.rb
- + plugins/stoa/test/setup_db.rb
- plugins/stoa/test/unit/usp_user_test.rb
- − plugins/suppliers/lib/currency_helper.rb


Changes:

=====================================
plugins/stoa/lib/stoa_plugin/usp_aluno_turma_grad.rb
=====================================
--- a/plugins/stoa/lib/stoa_plugin/usp_aluno_turma_grad.rb
+++ b/plugins/stoa/lib/stoa_plugin/usp_aluno_turma_grad.rb
@@ -1,6 +1,8 @@
+require_relative '../../test/setup_db' if Rails.env.test?
+
 class StoaPlugin::UspAlunoTurmaGrad < ApplicationRecord
 
-  establish_connection(:stoa)
+  establish_connection :stoa
 
   self.table_name = :alunoturma_gr
 


=====================================
plugins/stoa/lib/stoa_plugin/usp_user.rb
=====================================
--- a/plugins/stoa/lib/stoa_plugin/usp_user.rb
+++ b/plugins/stoa/lib/stoa_plugin/usp_user.rb
@@ -1,7 +1,10 @@
+require_relative '../../test/setup_db' if Rails.env.test?
+
 class StoaPlugin::UspUser < ApplicationRecord
 
-  establish_connection(:stoa)
-  self.table_name = 'pessoa'
+  establish_connection :stoa
+
+  self.table_name = :pessoa
 
   SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
 


=====================================
plugins/stoa/test/functional/account_controller_test.rb
=====================================
--- a/plugins/stoa/test/functional/account_controller_test.rb
+++ b/plugins/stoa/test/functional/account_controller_test.rb
@@ -5,18 +5,6 @@ class AccountControllerTest < ActionController::TestCase
 
   SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
 
-  @db = Tempfile.new('stoa-test')
-  ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => @db.path}
-  ActiveRecord::Base.establish_connection(:stoa)
-  ActiveRecord::Schema.verbose = false
-  ActiveRecord::Schema.create_table "pessoa" do |t|
-    t.integer  "codpes"
-    t.text     "numcpf"
-    t.date     "dtanas"
-  end
-  ActiveRecord::Base.establish_connection(:test)
-  StoaPlugin::UspUser.reset_column_information
-
   def setup
     @controller = AccountController.new
     StoaPlugin::UspUser.create!({:codpes => 12345678, :cpf => Digest::MD5.hexdigest(SALT+'12345678'), :birth_date => '1970-01-30'}, :without_protection => true)


=====================================
plugins/stoa/test/setup_db.rb
=====================================
--- /dev/null
+++ b/plugins/stoa/test/setup_db.rb
@@ -0,0 +1,14 @@
+ActiveRecord::Base.configurations['stoa'] = {
+  adapter:  'sqlite3',
+  database: Tempfile.new('stoa-test').path,
+}
+
+ActiveRecord::Base.establish_connection :stoa
+ActiveRecord::Schema.verbose = false
+ActiveRecord::Schema.create_table 'pessoa' do |t|
+  t.integer  'codpes'
+  t.text     'numcpf'
+  t.date     'dtanas'
+end
+ActiveRecord::Base.establish_connection :test
+


=====================================
plugins/stoa/test/unit/usp_user_test.rb
=====================================
--- a/plugins/stoa/test/unit/usp_user_test.rb
+++ b/plugins/stoa/test/unit/usp_user_test.rb
@@ -4,18 +4,6 @@ class StoaPlugin::UspUserTest < ActiveSupport::TestCase
 
   SALT=YAML::load(File.open(StoaPlugin.root_path + 'config.yml'))['salt']
 
-  @db = Tempfile.new('stoa-test')
-  ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => @db.path}
-  ActiveRecord::Base.establish_connection(:stoa)
-  ActiveRecord::Schema.verbose = false
-  ActiveRecord::Schema.create_table "pessoa" do |t|
-    t.integer  "codpes"
-    t.text     "numcpf"
-    t.date     "dtanas"
-  end
-  ActiveRecord::Base.establish_connection(:test)
-  StoaPlugin::UspUser.reset_column_information
-
   def setup
     StoaPlugin::UspUser.create({:codpes => 123456, :cpf => Digest::MD5.hexdigest(SALT+'12345678'), :birth_date => '1970-01-30'}, :without_protection => true)
   end


=====================================
plugins/suppliers/lib/currency_helper.rb deleted
=====================================
--- a/plugins/suppliers/lib/currency_helper.rb
+++ /dev/null
@@ -1 +0,0 @@
-../../orders/lib/currency_helper.rb
\ No newline at end of file



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/958b12265b30dc9df2c585b4152fa552c7f9d18e...af040d4cc71536a65493ab8e78ddfff0f64f3a36
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170315/9fe7daeb/attachment-0001.html>