Skip to content

Commit 66bb012

Browse files
committed
[MODEL] Added code for establishing ActiveRecord connections to test classes
With ActiveRecord 3.x, the connection setup in the main `setup` method doesn't seem to be called properly.
1 parent 94d0b28 commit 66bb012

9 files changed

+27
-0
lines changed

elasticsearch-model/test/integration/active_record_associations_parent_child.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require 'test_helper'
22
require 'active_record'
33

4+
# Needed for ActiveRecord 3.x ?
5+
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
6+
47
class Question < ActiveRecord::Base
58
include Elasticsearch::Model
69

elasticsearch-model/test/integration/active_record_associations_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require 'test_helper'
22
require 'active_record'
33

4+
# Needed for ActiveRecord 3.x ?
5+
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
6+
47
module Elasticsearch
58
module Model
69
class ActiveRecordAssociationsIntegrationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_basic_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
puts "ActiveRecord #{ActiveRecord::VERSION::STRING}", '-'*80
55

6+
# Needed for ActiveRecord 3.x ?
7+
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
8+
69
module Elasticsearch
710
module Model
811
class ActiveRecordBasicIntegrationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_custom_serialization_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require 'test_helper'
22
require 'active_record'
33

4+
# Needed for ActiveRecord 3.x ?
5+
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
6+
47
module Elasticsearch
58
module Model
69
class ActiveRecordCustomSerializationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_import_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require 'test_helper'
22
require 'active_record'
33

4+
# Needed for ActiveRecord 3.x ?
5+
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
6+
47
module Elasticsearch
58
module Model
69
class ActiveRecordImportIntegrationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_namespaced_model_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require 'test_helper'
22
require 'active_record'
33

4+
# Needed for ActiveRecord 3.x ?
5+
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
6+
47
module Elasticsearch
58
module Model
69
class ActiveRecordNamespacedModelIntegrationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_pagination_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require 'test_helper'
22
require 'active_record'
33

4+
# Needed for ActiveRecord 3.x ?
5+
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
6+
47
module Elasticsearch
58
module Model
69
class ActiveRecordPaginationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/dynamic_index_name_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require 'test_helper'
22
require 'active_record'
33

4+
# Needed for ActiveRecord 3.x ?
5+
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
6+
47
module Elasticsearch
58
module Model
69
class DynamicIndexNameTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/multiple_models_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
require 'test_helper'
22
require 'active_record'
33

4+
# Needed for ActiveRecord 3.x ?
5+
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
6+
47
Mongo.setup!
58

69
module Elasticsearch

0 commit comments

Comments
 (0)