Made it easier to test non-query methods

ankane · Feb 6, 2021 · 5c03f2d · 5c03f2d
1 parent a164cb2
commit 5c03f2d
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 17 deletions.
diff --git a/test/query_methods/mongoid_test.rb b/test/query_methods/mongoid_test.rb
@@ -1,4 +1,4 @@
-require_relative "../test_helper"
+require_relative "query_methods_helper"
 
 class MongoidEvent
   include Mongoid::Document

diff --git a/test/query_methods/mysql_json_test.rb b/test/query_methods/mysql_json_test.rb
@@ -1,4 +1,4 @@
-require_relative "../test_helper"
+require_relative "query_methods_helper"
 
 class MysqlJsonEvent < MysqlBase
   serialize :properties, JSON if connection.send(:mariadb?)

diff --git a/test/query_methods/mysql_text_test.rb b/test/query_methods/mysql_text_test.rb
@@ -1,4 +1,4 @@
-require_relative "../test_helper"
+require_relative "query_methods_helper"
 
 class MysqlTextEvent < MysqlBase
   serialize :properties, JSON

diff --git a/test/query_methods/postgresql_hstore_test.rb b/test/query_methods/postgresql_hstore_test.rb
@@ -1,4 +1,4 @@
-require_relative "../test_helper"
+require_relative "query_methods_helper"
 
 class PostgresqlHstoreEvent < PostgresqlBase
 end

diff --git a/test/query_methods/postgresql_json_test.rb b/test/query_methods/postgresql_json_test.rb
@@ -1,4 +1,4 @@
-require_relative "../test_helper"
+require_relative "query_methods_helper"
 
 class PostgresqlJsonEvent < PostgresqlBase
 end

diff --git a/test/query_methods/postgresql_jsonb_test.rb b/test/query_methods/postgresql_jsonb_test.rb
@@ -1,4 +1,4 @@
-require_relative "../test_helper"
+require_relative "query_methods_helper"
 
 class PostgresqlJsonbEvent < PostgresqlBase
 end

diff --git a/test/query_methods/postgresql_text_test.rb b/test/query_methods/postgresql_text_test.rb
@@ -1,4 +1,4 @@
-require_relative "../test_helper"
+require_relative "query_methods_helper"
 
 class PostgresqlTextEvent < PostgresqlBase
   serialize :properties, JSON

diff --git a/test/query_methods/query_methods_helper.rb b/test/query_methods/query_methods_helper.rb
@@ -0,0 +1,11 @@
+require_relative "../test_helper"
+
+# run setup / migrations
+require_relative "../support/mysql"
+require_relative "../support/postgresql"
+require_relative "../support/mongoid"
+
+# restore connection
+ActiveRecord::Base.establish_connection(:test)
+
+require_relative "../support/query_methods_test"
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -18,16 +18,6 @@
 
 Ahoy.logger = logger
 
-# run setup / migrations
-require_relative "support/mysql"
-require_relative "support/postgresql"
-require_relative "support/mongoid"
-
-# restore connection
-ActiveRecord::Base.establish_connection(:test)
-
-require_relative "support/query_methods_test"
-
 class Minitest::Test
   def with_options(options)
     previous_options = {}