Skip to content

Commit 8c684dc

Browse files
wangjohnrafaelfranca
authored andcommitted
Using ApplicationModel in Active Record tests.
This replaces the current use of ActiveRecord::Base in most tests.
1 parent b96bd30 commit 8c684dc

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

+103
-109
lines changed

activerecord/test/cases/adapter_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ def test_log_invalid_encoding
228228
class AdapterTestWithoutTransaction < ActiveRecord::TestCase
229229
self.use_transactional_fixtures = false
230230

231-
class Klass < ActiveRecord::Base
231+
class Klass < ApplicationModel
232232
end
233233

234234
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
end
77

88
repair_validations(CollationTest)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class MysqlConnectionTest < ActiveRecord::TestCase
66
include ConnectionHelper
77
include DdlHelper
88

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

1212
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
end
77

88
repair_validations(CollationTest)

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
@@ -7,7 +7,7 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
77
include InTimeZone
88
OID = ActiveRecord::ConnectionAdapters::PostgreSQL::OID
99

10-
class PgArray < ActiveRecord::Base
10+
class PgArray < ApplicationModel
1111
self.table_name = 'pg_arrays'
1212
end
1313

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

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

44
class PostgresqlByteaTest < ActiveRecord::TestCase
5-
class ByteaDataType < ActiveRecord::Base
5+
class ByteaDataType < ApplicationModel
66
self.table_name = 'bytea_data_type'
77
end
88

0 commit comments

Comments
 (0)