Skip to content

Commit 0223dc0

Browse files
committed
Using ApplicationModel in Active Record tests.
This replaces the current use of ActiveRecord::Base in most tests.
1 parent f38c74b commit 0223dc0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+120
-120
lines changed

activerecord/test/cases/adapter_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def test_select_all_always_return_activerecord_result
183183
class AdapterTestWithoutTransaction < ActiveRecord::TestCase
184184
self.use_transactional_fixtures = false
185185

186-
class Klass < ActiveRecord::Base
186+
class Klass < ApplicationModel
187187
end
188188

189189
def setup

activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'models/person'
33

44
class MysqlCaseSensitivityTest < ActiveRecord::TestCase
5-
class CollationTest < ActiveRecord::Base
5+
class CollationTest < ApplicationModel
66
validates_uniqueness_of :string_cs_column, :case_sensitive => false
77
validates_uniqueness_of :string_ci_column, :case_sensitive => false
88
end

activerecord/test/cases/adapters/mysql/connection_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require "cases/helper"
22

33
class MysqlConnectionTest < ActiveRecord::TestCase
4-
class Klass < ActiveRecord::Base
4+
class Klass < ApplicationModel
55
end
66

77
def setup

activerecord/test/cases/adapters/mysql/enum_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require "cases/helper"
22

33
class MysqlEnumTest < ActiveRecord::TestCase
4-
class EnumTest < ActiveRecord::Base
4+
class EnumTest < ApplicationModel
55
end
66

77
def test_enum_limit

activerecord/test/cases/adapters/mysql/reserved_word_test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
require "cases/helper"
22

3-
class Group < ActiveRecord::Base
3+
class Group < ApplicationModel
44
Group.table_name = 'group'
55
belongs_to :select
66
has_one :values
77
end
88

9-
class Select < ActiveRecord::Base
9+
class Select < ApplicationModel
1010
Select.table_name = 'select'
1111
has_many :groups
1212
end
1313

14-
class Values < ActiveRecord::Base
14+
class Values < ApplicationModel
1515
Values.table_name = 'values'
1616
end
1717

18-
class Distinct < ActiveRecord::Base
18+
class Distinct < ApplicationModel
1919
Distinct.table_name = 'distinct'
2020
has_and_belongs_to_many :selects
2121
has_many :values, :through => :groups

activerecord/test/cases/adapters/mysql2/case_sensitivity_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'models/person'
33

44
class Mysql2CaseSensitivityTest < ActiveRecord::TestCase
5-
class CollationTest < ActiveRecord::Base
5+
class CollationTest < ApplicationModel
66
validates_uniqueness_of :string_cs_column, :case_sensitive => false
77
validates_uniqueness_of :string_ci_column, :case_sensitive => false
88
end

activerecord/test/cases/adapters/mysql2/enum_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require "cases/helper"
22

33
class Mysql2EnumTest < ActiveRecord::TestCase
4-
class EnumTest < ActiveRecord::Base
4+
class EnumTest < ApplicationModel
55
end
66

77
def test_enum_limit

activerecord/test/cases/adapters/mysql2/reserved_word_test.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
require "cases/helper"
22

3-
class Group < ActiveRecord::Base
3+
class Group < ApplicationModel
44
Group.table_name = 'group'
55
belongs_to :select
66
has_one :values
77
end
88

9-
class Select < ActiveRecord::Base
9+
class Select < ApplicationModel
1010
Select.table_name = 'select'
1111
has_many :groups
1212
end
1313

14-
class Values < ActiveRecord::Base
14+
class Values < ApplicationModel
1515
Values.table_name = 'values'
1616
end
1717

18-
class Distinct < ActiveRecord::Base
18+
class Distinct < ApplicationModel
1919
Distinct.table_name = 'distinct'
2020
has_and_belongs_to_many :selects
2121
has_many :values, :through => :groups

activerecord/test/cases/adapters/postgresql/array_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'active_record/connection_adapters/postgresql_adapter'
55

66
class PostgresqlArrayTest < ActiveRecord::TestCase
7-
class PgArray < ActiveRecord::Base
7+
class PgArray < ApplicationModel
88
self.table_name = 'pg_arrays'
99
end
1010

activerecord/test/cases/adapters/postgresql/bytea_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require 'active_record/connection_adapters/postgresql_adapter'
66

77
class PostgresqlByteaTest < ActiveRecord::TestCase
8-
class ByteaDataType < ActiveRecord::Base
8+
class ByteaDataType < ApplicationModel
99
self.table_name = 'bytea_data_type'
1010
end
1111

activerecord/test/cases/adapters/postgresql/connection_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module ActiveRecord
44
class PostgresqlConnectionTest < ActiveRecord::TestCase
5-
class NonExistentTable < ActiveRecord::Base
5+
class NonExistentTable < ApplicationModel
66
end
77

88
def setup

activerecord/test/cases/adapters/postgresql/datatype_test.rb

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
require "cases/helper"
22

3-
class PostgresqlArray < ActiveRecord::Base
3+
class PostgresqlArray < ApplicationModel
44
end
55

6-
class PostgresqlRange < ActiveRecord::Base
6+
class PostgresqlRange < ApplicationModel
77
end
88

9-
class PostgresqlTsvector < ActiveRecord::Base
9+
class PostgresqlTsvector < ApplicationModel
1010
end
1111

12-
class PostgresqlMoney < ActiveRecord::Base
12+
class PostgresqlMoney < ApplicationModel
1313
end
1414

15-
class PostgresqlNumber < ActiveRecord::Base
15+
class PostgresqlNumber < ApplicationModel
1616
end
1717

18-
class PostgresqlTime < ActiveRecord::Base
18+
class PostgresqlTime < ApplicationModel
1919
end
2020

21-
class PostgresqlNetworkAddress < ActiveRecord::Base
21+
class PostgresqlNetworkAddress < ApplicationModel
2222
end
2323

24-
class PostgresqlBitString < ActiveRecord::Base
24+
class PostgresqlBitString < ApplicationModel
2525
end
2626

27-
class PostgresqlOid < ActiveRecord::Base
27+
class PostgresqlOid < ApplicationModel
2828
end
2929

30-
class PostgresqlTimestampWithZone < ActiveRecord::Base
30+
class PostgresqlTimestampWithZone < ApplicationModel
3131
end
3232

33-
class PostgresqlUUID < ActiveRecord::Base
33+
class PostgresqlUUID < ApplicationModel
3434
end
3535

36-
class PostgresqlLtree < ActiveRecord::Base
36+
class PostgresqlLtree < ApplicationModel
3737
end
3838

3939
class PostgresqlDataTypeTest < ActiveRecord::TestCase

activerecord/test/cases/adapters/postgresql/hstore_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require 'active_record/connection_adapters/postgresql_adapter'
66

77
class PostgresqlHstoreTest < ActiveRecord::TestCase
8-
class Hstore < ActiveRecord::Base
8+
class Hstore < ApplicationModel
99
self.table_name = 'hstores'
1010
end
1111

activerecord/test/cases/adapters/postgresql/json_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require 'active_record/connection_adapters/postgresql_adapter'
66

77
class PostgresqlJSONTest < ActiveRecord::TestCase
8-
class JsonDataType < ActiveRecord::Base
8+
class JsonDataType < ApplicationModel
99
self.table_name = 'json_data_type'
1010
end
1111

activerecord/test/cases/adapters/postgresql/ltree_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'active_record/connection_adapters/postgresql_adapter'
55

66
class PostgresqlLtreeTest < ActiveRecord::TestCase
7-
class Ltree < ActiveRecord::Base
7+
class Ltree < ApplicationModel
88
self.table_name = 'ltrees'
99
end
1010

activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require "cases/helper"
22

3-
class SchemaThing < ActiveRecord::Base
3+
class SchemaThing < ApplicationModel
44
end
55

66
class SchemaAuthorizationTest < ActiveRecord::TestCase

activerecord/test/cases/adapters/postgresql/schema_test.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ class SchemaTest < ActiveRecord::TestCase
3030
UNMATCHED_SEQUENCE_NAME = 'unmatched_primary_key_default_value_seq'
3131
UNMATCHED_PK_TABLE_NAME = 'table_with_unmatched_sequence_for_pk'
3232

33-
class Thing1 < ActiveRecord::Base
33+
class Thing1 < ApplicationModel
3434
self.table_name = "test_schema.things"
3535
end
3636

37-
class Thing2 < ActiveRecord::Base
37+
class Thing2 < ApplicationModel
3838
self.table_name = "test_schema2.things"
3939
end
4040

41-
class Thing3 < ActiveRecord::Base
41+
class Thing3 < ApplicationModel
4242
self.table_name = 'test_schema."things.table"'
4343
end
4444

45-
class Thing4 < ActiveRecord::Base
45+
class Thing4 < ApplicationModel
4646
self.table_name = 'test_schema."Things"'
4747
end
4848

49-
class Thing5 < ActiveRecord::Base
49+
class Thing5 < ApplicationModel
5050
self.table_name = 'things'
5151
end
5252

activerecord/test/cases/adapters/postgresql/uuid_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require 'active_record/connection_adapters/postgresql_adapter'
66

77
class PostgresqlUUIDTest < ActiveRecord::TestCase
8-
class UUID < ActiveRecord::Base
8+
class UUID < ApplicationModel
99
self.table_name = 'pg_uuids'
1010
end
1111

@@ -65,7 +65,7 @@ def test_schema_dumper_for_uuid_primary_key
6565
end
6666

6767
class PostgresqlUUIDTestNilDefault < ActiveRecord::TestCase
68-
class UUID < ActiveRecord::Base
68+
class UUID < ApplicationModel
6969
self.table_name = 'pg_uuids'
7070
end
7171

activerecord/test/cases/adapters/postgresql/view_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class ViewTest < ActiveRecord::TestCase
1313
'moment timestamp without time zone'
1414
]
1515

16-
class ThingView < ActiveRecord::Base
16+
class ThingView < ApplicationModel
1717
self.table_name = 'test_schema.view_things'
1818
end
1919

activerecord/test/cases/adapters/postgresql/xml_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
require 'active_record/connection_adapters/postgresql_adapter'
66

77
class PostgresqlXMLTest < ActiveRecord::TestCase
8-
class XmlDataType < ActiveRecord::Base
8+
class XmlDataType < ApplicationModel
99
self.table_name = 'xml_data_type'
1010
end
1111

activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module ConnectionAdapters
77
class SQLite3AdapterTest < ActiveRecord::TestCase
88
self.use_transactional_fixtures = false
99

10-
class DualEncoding < ActiveRecord::Base
10+
class DualEncoding < ApplicationModel
1111
end
1212

1313
def setup

activerecord/test/cases/aggregations_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def test_custom_converter
143143
class OverridingAggregationsTest < ActiveRecord::TestCase
144144
class DifferentName; end
145145

146-
class Person < ActiveRecord::Base
146+
class Person < ApplicationModel
147147
composed_of :composed_of, :mapping => %w(person_first_name first_name)
148148
end
149149

activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'models/tagging'
44

55
module Namespaced
6-
class Post < ActiveRecord::Base
6+
class Post < ApplicationModel
77
self.table_name = 'posts'
88
has_one :tagging, :as => :taggable, :class_name => 'Tagging'
99
end

activerecord/test/cases/associations/eager_load_nested_include_test.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,38 @@ def sample; @@remembered.sample; end
2222
end
2323
end
2424

25-
class ShapeExpression < ActiveRecord::Base
25+
class ShapeExpression < ApplicationModel
2626
belongs_to :shape, :polymorphic => true
2727
belongs_to :paint, :polymorphic => true
2828
end
2929

30-
class Circle < ActiveRecord::Base
30+
class Circle < ApplicationModel
3131
has_many :shape_expressions, :as => :shape
3232
include Remembered
3333
end
34-
class Square < ActiveRecord::Base
34+
class Square < ApplicationModel
3535
has_many :shape_expressions, :as => :shape
3636
include Remembered
3737
end
38-
class Triangle < ActiveRecord::Base
38+
class Triangle < ApplicationModel
3939
has_many :shape_expressions, :as => :shape
4040
include Remembered
4141
end
42-
class PaintColor < ActiveRecord::Base
42+
class PaintColor < ApplicationModel
4343
has_many :shape_expressions, :as => :paint
4444
belongs_to :non_poly, :foreign_key => "non_poly_one_id", :class_name => "NonPolyOne"
4545
include Remembered
4646
end
47-
class PaintTexture < ActiveRecord::Base
47+
class PaintTexture < ApplicationModel
4848
has_many :shape_expressions, :as => :paint
4949
belongs_to :non_poly, :foreign_key => "non_poly_two_id", :class_name => "NonPolyTwo"
5050
include Remembered
5151
end
52-
class NonPolyOne < ActiveRecord::Base
52+
class NonPolyOne < ApplicationModel
5353
has_many :paint_colors
5454
include Remembered
5555
end
56-
class NonPolyTwo < ActiveRecord::Base
56+
class NonPolyTwo < ApplicationModel
5757
has_many :paint_textures
5858
include Remembered
5959
end

0 commit comments

Comments
 (0)