iknow_view_models 3.14.3 → 3.15.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/test.yml +1 -3
  3. data/Appraisals +7 -15
  4. data/iknow_view_models.gemspec +3 -0
  5. data/lib/iknow_view_models/version.rb +1 -1
  6. data/lib/view_model/active_record/collection_nested_controller.rb +1 -1
  7. data/lib/view_model/active_record/controller.rb +1 -33
  8. data/lib/view_model/active_record/controller_base.rb +0 -9
  9. data/lib/view_model/config.rb +1 -0
  10. data/lib/view_model/controller/migration_versions.rb +13 -3
  11. data/lib/view_model/controller.rb +53 -7
  12. data/lib/view_model/deserialization_error.rb +30 -1
  13. data/lib/view_model/migratable_view.rb +2 -2
  14. data/lib/view_model/migration/strict_migration_error.rb +23 -0
  15. data/lib/view_model/migration.rb +1 -0
  16. data/lib/view_model/migrator.rb +13 -2
  17. data/lib/view_model/references.rb +8 -0
  18. data/lib/view_model/serialize_context.rb +1 -1
  19. data/test/helpers/arvm_test_utilities.rb +0 -1
  20. data/test/helpers/match_enumerator.rb +3 -3
  21. data/test/helpers/viewmodel_spec_helpers.rb +1 -2
  22. data/test/test_helper.rb +28 -0
  23. data/test/unit/view_model/access_control_test.rb +2 -5
  24. data/test/unit/view_model/active_record/alias_test.rb +2 -2
  25. data/test/unit/view_model/active_record/belongs_to_test.rb +2 -2
  26. data/test/unit/view_model/active_record/cache_test.rb +1 -3
  27. data/test/unit/view_model/active_record/cloner_test.rb +2 -4
  28. data/test/unit/view_model/active_record/controller_nested_test.rb +4 -6
  29. data/test/unit/view_model/active_record/controller_test.rb +4 -6
  30. data/test/unit/view_model/active_record/counter_test.rb +2 -2
  31. data/test/unit/view_model/active_record/customization_test.rb +2 -2
  32. data/test/unit/view_model/active_record/has_many_test.rb +2 -2
  33. data/test/unit/view_model/active_record/has_many_through_poly_test.rb +2 -2
  34. data/test/unit/view_model/active_record/has_many_through_test.rb +2 -2
  35. data/test/unit/view_model/active_record/has_one_test.rb +2 -2
  36. data/test/unit/view_model/active_record/migration_test.rb +75 -4
  37. data/test/unit/view_model/active_record/namespacing_test.rb +1 -3
  38. data/test/unit/view_model/active_record/poly_test.rb +2 -2
  39. data/test/unit/view_model/active_record/shared_test.rb +2 -2
  40. data/test/unit/view_model/active_record/version_test.rb +2 -2
  41. data/test/unit/view_model/active_record_test.rb +2 -3
  42. data/test/unit/view_model/callbacks_test.rb +2 -2
  43. data/test/unit/view_model/controller_test.rb +2 -3
  44. data/test/unit/view_model/deserialization_error/database_constraint_test.rb +37 -0
  45. data/test/unit/view_model/deserialization_error/unique_violation_test.rb +1 -3
  46. data/test/unit/view_model/error_wrapping_test.rb +35 -4
  47. data/test/unit/view_model/garbage_collection_test.rb +1 -2
  48. data/test/unit/view_model/record_test.rb +2 -3
  49. data/test/unit/view_model/registry_test.rb +1 -3
  50. data/test/unit/view_model/traversal_context_test.rb +1 -3
  51. data/test/unit/view_model_test.rb +1 -4
  52. metadata +49 -3
  53. data/gemfiles/rails_6_1.gemfile +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 32034ee1a16051289f76e317a76a7356f32093fd4439aa75503ffa00ab1f8b95
4
- data.tar.gz: cb8a4669e79d68888c14d76b9ed718c4f2d8336da0989a22a7eafc779aff3bca
3
+ metadata.gz: c397b7573d9b99f8d3eff86fc5d5a1d5d3b884b0e094adc6693154e8d5556cf7
4
+ data.tar.gz: 900b604ddb7002b0ff4dc585ff18718014dce2f4c80cc6db710ef005692fd781
5
5
  SHA512:
6
- metadata.gz: 8effb32744fe38236249ff4a483ff9a778efdd92ca00693eb8c3f00546fedfc4de7792456fcbd04d652659a713a4ecd8d3efefde43633bd9d19a666c93e930fb
7
- data.tar.gz: 3915fbdfa63db615439e186da904c7c2899727e66a0326abf31b6d7398423761dd79db1c544ae69ba5983200d91d5ed1929449307cf961da2073cc02e3909307
6
+ metadata.gz: fc257d7566cccfdc25abb2200df10d195a193473b3908290fdfa7a9594db9d1d2930c233f0ba1dc78f45022a19002fec2b2359a9f53c9d33ef5260cd5fdc2b6a
7
+ data.tar.gz: 544d64b10b9472af49691ad92279d2fee297a551b51057e757aaf67034896e8ef82a1a7fe7239d0f46e7d18214f393b115e8d3a0d0aa3c0693e4a283921741c3
@@ -26,10 +26,8 @@ jobs:
26
26
  strategy:
27
27
  fail-fast: false
28
28
  matrix:
29
- ruby-version: ['3.1', '3.2', '3.3']
29
+ ruby-version: ['3.2', '3.3']
30
30
  include:
31
- - ruby-version: '3.1'
32
- bundle-gemfile: gemfiles/rails_6_1.gemfile
33
31
  - ruby-version: '3.2'
34
32
  bundle-gemfile: gemfiles/rails_7_0.gemfile
35
33
  - ruby-version: '3.3'
data/Appraisals CHANGED
@@ -1,19 +1,11 @@
1
- appraise 'rails-5-2' do
2
- gem 'activerecord', '~> 5.2.0'
3
- gem 'activesupport', '~> 5.2.0'
4
- end
5
-
6
- appraise 'rails-6-0' do
7
- gem 'activerecord', '~> 6.0.0'
8
- gem 'activesupport', '~> 6.0.0'
9
- end
10
-
11
- appraise 'rails-6-1' do
12
- gem 'activerecord', '~> 6.1.0'
13
- gem 'activesupport', '~> 6.1.0'
14
- end
15
-
16
1
  appraise 'rails-7-0' do
2
+ gem 'minitest-ci'
17
3
  gem 'activerecord', '~> 7.0.0'
18
4
  gem 'activesupport', '~> 7.0.0'
19
5
  end
6
+
7
+ appraise 'rails-7-1' do
8
+ gem 'minitest-ci'
9
+ gem 'activerecord', '~> 7.1.0'
10
+ gem 'activesupport', '~> 7.1.0'
11
+ end
@@ -44,7 +44,10 @@ Gem::Specification.new do |spec|
44
44
  spec.add_development_dependency 'bundler'
45
45
  spec.add_development_dependency 'byebug'
46
46
  spec.add_development_dependency 'method_source'
47
+ spec.add_development_dependency 'minitest', '~> 6.0.0'
47
48
  spec.add_development_dependency 'minitest-hooks'
49
+ spec.add_development_dependency 'minitest-mock'
50
+ spec.add_development_dependency 'minitest-reporters'
48
51
  spec.add_development_dependency 'pg'
49
52
  spec.add_development_dependency 'pry'
50
53
  spec.add_development_dependency 'rake'
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module IknowViewModels
4
- VERSION = '3.14.3'
4
+ VERSION = '3.15.1'
5
5
  end
@@ -76,7 +76,7 @@ module ViewModel::ActiveRecord::CollectionNestedController
76
76
  owner_viewmodel.transaction do
77
77
  owner_view = owner_viewmodel.find(owner_viewmodel_id, eager_include: false, lock: lock_owner)
78
78
  owner_view.delete_associated(association_name, viewmodel_id, type: viewmodel_class, deserialize_context: deserialize_context)
79
- render_viewmodel(nil)
79
+ render_viewmodel(nil, serialize_context: serialize_context)
80
80
  end
81
81
  end
82
82
 
@@ -3,7 +3,6 @@
3
3
  require 'view_model/active_record/controller_base'
4
4
  require 'view_model/active_record/collection_nested_controller'
5
5
  require 'view_model/active_record/singular_nested_controller'
6
- require 'view_model/controller/migration_versions'
7
6
 
8
7
  # Controller for accessing an ViewModel::ActiveRecord
9
8
  # Provides for the following routes:
@@ -17,7 +16,6 @@ module ViewModel::ActiveRecord::Controller
17
16
  include ViewModel::ActiveRecord::ControllerBase
18
17
  include ViewModel::ActiveRecord::CollectionNestedController
19
18
  include ViewModel::ActiveRecord::SingularNestedController
20
- include ViewModel::Controller::MigrationVersions
21
19
 
22
20
  def show(scope: nil, viewmodel_class: self.viewmodel_class, serialize_context: new_serialize_context(viewmodel_class: viewmodel_class))
23
21
  view = nil
@@ -65,33 +63,7 @@ module ViewModel::ActiveRecord::Controller
65
63
  view.destroy!(deserialize_context: deserialize_context)
66
64
  end
67
65
  end
68
- render_viewmodel(nil)
69
- end
70
-
71
- included do
72
- etag { migrated_deep_schema_version }
73
- end
74
-
75
- def parse_viewmodel_updates
76
- super.tap do |update_hash, refs|
77
- if migration_versions.present?
78
- migrator = ViewModel::UpMigrator.new(migration_versions)
79
- migrator.migrate!({ 'data' => update_hash, 'references' => refs })
80
- end
81
- end
82
- end
83
-
84
- def prerender_viewmodel(...)
85
- super do |jbuilder|
86
- yield(jbuilder) if block_given?
87
-
88
- # migrate the resulting structure before it's serialized to a json string
89
- if migration_versions.present?
90
- tree = jbuilder.attributes!
91
- migrator = ViewModel::DownMigrator.new(migration_versions)
92
- migrator.migrate!(tree)
93
- end
94
- end
66
+ render_viewmodel(nil, serialize_context: serialize_context)
95
67
  end
96
68
 
97
69
  private
@@ -119,8 +91,4 @@ module ViewModel::ActiveRecord::Controller
119
91
  def viewmodel_id
120
92
  parse_param(:id, with: ViewmodelIdSerializer)
121
93
  end
122
-
123
- def migrated_deep_schema_version
124
- ViewModel::Migrator.migrated_deep_schema_version(viewmodel_class, migration_versions, include_referenced: true)
125
- end
126
94
  end
@@ -9,15 +9,6 @@ module ViewModel::ActiveRecord::ControllerBase
9
9
 
10
10
  protected
11
11
 
12
- # Override (pre)render_viewmodel to use the default serialization context from this controller.
13
- def render_viewmodel(viewmodel, serialize_context: new_serialize_context, **args)
14
- super(viewmodel, serialize_context: serialize_context, **args)
15
- end
16
-
17
- def prerender_viewmodel(viewmodel, serialize_context: new_serialize_context, **args)
18
- super(viewmodel, serialize_context: serialize_context, **args)
19
- end
20
-
21
12
  def new_deserialize_context(viewmodel_class: self.viewmodel_class, access_control: self.access_control.new, **args)
22
13
  viewmodel_class.new_deserialize_context(access_control: access_control, **args)
23
14
  end
@@ -6,6 +6,7 @@ require 'keyword_builder'
6
6
  ViewModel::Config = Value.new(
7
7
  show_cause_in_error_view: false,
8
8
  debug_deserialization: false,
9
+ strict_migration_versions: false,
9
10
  )
10
11
 
11
12
  class ViewModel::Config
@@ -8,9 +8,19 @@ module ViewModel::Controller::MigrationVersions
8
8
  def migration_versions
9
9
  @migration_versions ||=
10
10
  begin
11
- specified_migration_versions.reject do |viewmodel_class, required_version|
12
- viewmodel_class.schema_version == required_version
13
- end.freeze
11
+ versions = specified_migration_versions.dup
12
+
13
+ unless ViewModel::Config.strict_migration_versions
14
+ # Ignore the current version. This allows skipping migrations if only
15
+ # current versions are requested. Can't be ignored when strict
16
+ # migrations are enabled, since we need to walk the tree to assert
17
+ # that all visited types are mentioned.
18
+ versions.reject! do |viewmodel_class, required_version|
19
+ viewmodel_class.schema_version == required_version
20
+ end
21
+ end
22
+
23
+ versions.freeze
14
24
  end
15
25
  end
16
26
 
@@ -6,48 +6,86 @@ require 'oj'
6
6
  module ViewModel::Controller
7
7
  extend ActiveSupport::Concern
8
8
 
9
+ require 'view_model/controller/migration_versions'
10
+ include ViewModel::Controller::MigrationVersions
11
+
9
12
  included do
10
13
  rescue_from ViewModel::AbstractError, with: ->(ex) do
11
14
  render_error(ex.view, ex.status)
12
15
  end
16
+
17
+ etag { migrated_deep_schema_version }
13
18
  end
14
19
 
15
- def render_viewmodel(viewmodel, status: nil, serialize_context: viewmodel.class.try(:new_serialize_context), &block)
20
+ def render_viewmodel(viewmodel, status: nil, serialize_context:, &block)
16
21
  prerender = prerender_viewmodel(viewmodel, serialize_context: serialize_context, &block)
17
22
  render_json_string(prerender, status: status)
18
23
  end
19
24
 
20
25
  # Render viewmodel(s) to a JSON API response as a String
21
- def prerender_viewmodel(viewmodel, status: nil, serialize_context: viewmodel.class.try(:new_serialize_context))
26
+ def prerender_viewmodel(viewmodel, status: nil, serialize_context:)
22
27
  encode_jbuilder do |json|
23
28
  json.data do
24
29
  ViewModel.serialize(viewmodel, json, serialize_context: serialize_context)
25
30
  end
26
31
 
32
+ yield(json) if block_given?
33
+
27
34
  if serialize_context && serialize_context.has_references?
28
35
  json.references do
29
36
  serialize_context.serialize_references(json)
30
37
  end
31
38
  end
32
39
 
33
- yield(json) if block_given?
40
+ # migrate the resulting structure before it's serialized to a json string
41
+ if migration_versions.present?
42
+ tree = json.attributes!
43
+ migrator = ViewModel::DownMigrator.new(migration_versions)
44
+ migrator.migrate!(tree)
45
+ end
34
46
  end
35
47
  end
36
48
 
37
49
  # Render an arbitrarily nested tree of hashes and arrays with pre-rendered
38
50
  # JSON string terminals. Useful for rendering cached views without parsing
39
51
  # then re-serializing the cached JSON.
40
- def render_json_view(json_view, json_references: {}, status: nil, &block)
41
- prerender = prerender_json_view(json_view, json_references: json_references, &block)
52
+ def render_json_view(json_view, json_references: {}, status: nil, serialize_context:, &block)
53
+ prerender = prerender_json_view(json_view, json_references: json_references, serialize_context: serialize_context, &block)
42
54
  render_json_string(prerender, status: status)
43
55
  end
44
56
 
45
- def prerender_json_view(json_view, json_references: {})
57
+ def prerender_json_view(json_view, json_references: {}, serialize_context:)
46
58
  json_view = wrap_json_view(json_view)
47
59
  json_references = wrap_json_view(json_references)
48
60
 
49
61
  encode_jbuilder do |json|
50
62
  json.data json_view
63
+
64
+ if block_given?
65
+ yield(json)
66
+
67
+ # The block can contribute attributes directly to the jbuilder and
68
+ # references via the serialize context. If it did, we need to serialize,
69
+ # migrate, and merge them.
70
+ block_attributes = json.attributes!.except('data')
71
+
72
+ if serialize_context && serialize_context.has_references?
73
+ block_references = serialize_context.serialize_references_to_hash
74
+ end
75
+
76
+ has_migrations = defined?(migration_versions) && migration_versions.present?
77
+
78
+ if has_migrations && (block_attributes.present? || block_references.present?)
79
+ migrator = ViewModel::DownMigrator.new(migration_versions)
80
+ tree = block_attributes.merge({ 'references' => block_references })
81
+ migrator.migrate!(tree)
82
+ end
83
+
84
+ if block_references.present?
85
+ json_references = json_references.reverse_merge(block_references)
86
+ end
87
+ end
88
+
51
89
  if json_references.present?
52
90
  json.references do
53
91
  json_references.sort.each do |key, value|
@@ -55,7 +93,6 @@ module ViewModel::Controller
55
93
  end
56
94
  end
57
95
  end
58
- yield(json) if block_given?
59
96
  end
60
97
  end
61
98
 
@@ -83,6 +120,11 @@ module ViewModel::Controller
83
120
  update_hash = _extract_update_data(data_param)
84
121
  refs = _extract_param_hash(refs_param)
85
122
 
123
+ if migration_versions.present?
124
+ migrator = ViewModel::UpMigrator.new(migration_versions)
125
+ migrator.migrate!({ 'data' => update_hash, 'references' => refs })
126
+ end
127
+
86
128
  return update_hash, refs
87
129
  end
88
130
 
@@ -128,6 +170,10 @@ module ViewModel::Controller
128
170
  end
129
171
  end
130
172
 
173
+ def migrated_deep_schema_version
174
+ ViewModel::Migrator.migrated_deep_schema_version(viewmodel_class, migration_versions, include_referenced: true)
175
+ end
176
+
131
177
  def encode_jbuilder
132
178
  builder = Jbuilder.new do |json|
133
179
  yield json
@@ -377,7 +377,36 @@ class ViewModel
377
377
  when PG::UniqueViolation, PG::ExclusionViolation
378
378
  UniqueViolation.from_postgres_error(exception.cause, nodes)
379
379
  else
380
- self.new(exception.message, nodes)
380
+ self.new(redact_failing_row(exception), nodes)
381
+ end
382
+ end
383
+
384
+ class << self
385
+ FAILING_ROW_PREFIX = 'Failing row contains '
386
+ REDACTED_FAILING_ROW = 'Failing row contains (redacted).'
387
+
388
+ private
389
+
390
+ # Postgres reports CHECK and NOT NULL violations with "Failing row
391
+ # contains (...)" including every column of the row being written.
392
+ # Redact them.
393
+ def redact_failing_row(exception)
394
+ message = exception.message
395
+
396
+ pg_error = exception.cause
397
+ row_detail = pg_error.result&.error_field(PG::PG_DIAG_MESSAGE_DETAIL) if pg_error.is_a?(PG::Error)
398
+
399
+ if row_detail&.start_with?(FAILING_ROW_PREFIX) && message.include?(row_detail)
400
+ # With a structured error, replace the exact detail reported by
401
+ # Postgres rather than parsing the message.
402
+ message.sub(row_detail) { REDACTED_FAILING_ROW }
403
+ elsif (index = message.index(FAILING_ROW_PREFIX))
404
+ # Without a structured error we can't find the end of the message,
405
+ # so drop everything after it.
406
+ message[0, index] + REDACTED_FAILING_ROW
407
+ else
408
+ message
409
+ end
381
410
  end
382
411
  end
383
412
  end
@@ -10,9 +10,9 @@ module ViewModel::MigratableView
10
10
  extend ActiveSupport::Concern
11
11
 
12
12
  class_methods do
13
- def inherited(base)
13
+ def inherited(subclass)
14
14
  super
15
- base.initialize_as_migratable_view
15
+ subclass.initialize_as_migratable_view
16
16
  end
17
17
 
18
18
  def initialize_as_migratable_view
@@ -0,0 +1,23 @@
1
+ # frozen_string_literal: true
2
+
3
+ class ViewModel::Migration::StrictMigrationError < ViewModel::AbstractError
4
+ attr_reader :vm_name
5
+
6
+ status 400
7
+ code 'Migration.StrictMigrationError'
8
+
9
+ def initialize(vm_name)
10
+ @vm_name = vm_name
11
+ super()
12
+ end
13
+
14
+ def detail
15
+ "No version was provided for the view #{vm_name}"
16
+ end
17
+
18
+ def meta
19
+ {
20
+ viewmodel: vm_name,
21
+ }
22
+ end
23
+ end
@@ -4,6 +4,7 @@ class ViewModel::Migration
4
4
  require 'view_model/migration/no_path_error'
5
5
  require 'view_model/migration/one_way_error'
6
6
  require 'view_model/migration/unspecified_version_error'
7
+ require 'view_model/migration/strict_migration_error'
7
8
 
8
9
  REFERENCE_ONLY_KEYS = [
9
10
  ViewModel::TYPE_ATTRIBUTE,
@@ -26,6 +26,10 @@ class ViewModel
26
26
  MigrationPlan = Struct.new(:path, :required_version, :current_version, :viewmodel_class)
27
27
 
28
28
  def initialize(required_versions)
29
+ # If strict migrations are enabled, a version must be explicitly specified
30
+ # for every view used
31
+ @strict_permitted_views = required_versions.each_key.to_set(&:view_name)
32
+
29
33
  @plans = required_versions.each_with_object({}) do |(viewmodel_class, required_version), h|
30
34
  current_version = viewmodel_class.schema_version
31
35
  next if required_version == current_version
@@ -68,6 +72,13 @@ class ViewModel
68
72
 
69
73
  private
70
74
 
75
+ def fetch_plan(view_name)
76
+ if ViewModel::Config.strict_migration_versions && !@strict_permitted_views.include?(view_name)
77
+ raise ViewModel::Migration::StrictMigrationError.new(view_name)
78
+ end
79
+ @plans[view_name]
80
+ end
81
+
71
82
  def migrate_tree!(node, references:)
72
83
  case node
73
84
  when Hash
@@ -127,7 +138,7 @@ class ViewModel
127
138
  end
128
139
 
129
140
  def migrate_viewmodel!(view_name, source_version, view_hash, references)
130
- plan = @plans[view_name]
141
+ plan = fetch_plan(view_name)
131
142
  return false unless plan
132
143
 
133
144
  return false if source_version == plan.current_version
@@ -154,7 +165,7 @@ class ViewModel
154
165
  private
155
166
 
156
167
  def migrate_viewmodel!(view_name, source_version, view_hash, references)
157
- plan = @plans[view_name]
168
+ plan = fetch_plan(view_name)
158
169
  return false unless plan
159
170
 
160
171
  # In a serialized output, the source version should always be the present
@@ -30,6 +30,14 @@ class ViewModel
30
30
  ref
31
31
  end
32
32
 
33
+ def add_preserialized_reference(ref, literal_value)
34
+ return ref if @value_by_ref.has_key?(ref)
35
+
36
+ @ref_by_value[literal_value] = ref
37
+ @value_by_ref[ref] = literal_value
38
+ ref
39
+ end
40
+
33
41
  def clear!
34
42
  @ref_by_value.clear
35
43
  @value_by_ref.clear
@@ -19,7 +19,7 @@ class ViewModel::SerializeContext < ViewModel::TraversalContext
19
19
  end
20
20
 
21
21
  delegate :references, :flatten_references, to: :shared_context
22
- delegate :add_reference, :has_references?, to: :references
22
+ delegate :add_reference, :add_preserialized_reference, :has_references?, to: :references
23
23
 
24
24
  # Return viewmodels referenced during serialization and clear @references.
25
25
  def extract_referenced_views!
@@ -2,7 +2,6 @@
2
2
 
3
3
  require 'logger'
4
4
  require 'active_support'
5
- require 'minitest/hooks'
6
5
 
7
6
  require 'view_model'
8
7
  require 'view_model/test_helpers'
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  # From https://stackoverflow.com/a/41293357
4
- module MiniTest::Assertions
4
+ module Minitest::Assertions
5
5
  class MatchEnumerator
6
6
  def initialize(expected, actual)
7
7
  @expected = expected
@@ -54,6 +54,6 @@ module MiniTest::Assertions
54
54
  result, message = MatchEnumerator.new(expected, actual).match
55
55
  assert result, message
56
56
  end
57
- end # MiniTest::Assertions
57
+ end # Minitest::Assertions
58
58
 
59
- Enumerator.infect_an_assertion :assert_match_enumerator, :must_contain_exactly
59
+ Minitest::Expectation.infect_an_assertion :assert_match_enumerator, :must_contain_exactly
@@ -3,8 +3,7 @@
3
3
  require 'view_model'
4
4
  require 'view_model/test_helpers'
5
5
 
6
- require 'minitest/unit'
7
- require 'minitest/hooks'
6
+ require 'minitest'
8
7
 
9
8
  module ViewModelSpecHelpers
10
9
  module Base
@@ -0,0 +1,28 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'bundler/setup'
4
+
5
+ require 'minitest'
6
+ Minitest.load_plugins
7
+
8
+ require 'minitest/hooks/default'
9
+ require 'minitest/hooks/test'
10
+ require 'minitest/mock'
11
+ require 'minitest/reporters'
12
+ require 'minitest/reporters/junit_reporter'
13
+
14
+ require 'rspec/expectations'
15
+ require 'rspec/expectations/minitest_integration'
16
+
17
+ FileUtils.mkdir_p('test/reports')
18
+ Minitest::Reporters.use!(
19
+ [
20
+ Minitest::Reporters::DefaultReporter.new,
21
+ Minitest::Reporters::JUnitReporter.new(
22
+ 'test/reports',
23
+ single_file: false,
24
+ ),
25
+ ],
26
+ )
27
+
28
+ require 'minitest/autorun'
@@ -1,14 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../test_helper'
4
+
3
5
  require_relative '../../helpers/arvm_test_utilities'
4
6
  require_relative '../../helpers/arvm_test_models'
5
7
  require_relative '../../helpers/viewmodel_spec_helpers'
6
8
 
7
- require 'minitest/autorun'
8
- require 'minitest/unit'
9
-
10
- require 'rspec/expectations/minitest_integration'
11
-
12
9
  require 'view_model/active_record'
13
10
 
14
11
  class ViewModel::AccessControlTest < ActiveSupport::TestCase
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
  require_relative '../../../helpers/viewmodel_spec_helpers'
6
8
 
7
- require 'minitest/autorun'
8
-
9
9
  require 'view_model/active_record'
10
10
 
11
11
  class ViewModel::ActiveRecord::Alias < ActiveSupport::TestCase
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
  require_relative '../../../helpers/viewmodel_spec_helpers'
6
8
 
7
- require 'minitest/autorun'
8
-
9
9
  require 'view_model/active_record'
10
10
 
11
11
  class ViewModel::ActiveRecord::BelongsToTest < ActiveSupport::TestCase
@@ -1,8 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
3
+ require_relative '../../../test_helper'
6
4
 
7
5
  require_relative '../../../helpers/arvm_test_models'
8
6
  require_relative '../../../helpers/arvm_test_utilities'
@@ -1,13 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
3
+ require_relative '../../../test_helper'
6
4
 
7
5
  require_relative '../../../helpers/arvm_test_models'
8
6
  require_relative '../../../helpers/viewmodel_spec_helpers'
9
7
 
10
- # MiniTest::Spec.register_spec_type(/./, Minitest::HooksSpec)
8
+ # Minitest::Spec.register_spec_type(/./, Minitest::HooksSpec)
11
9
 
12
10
  require 'view_model'
13
11
  require 'view_model/active_record'
@@ -1,15 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
6
-
7
- require 'view_model'
8
- require 'view_model/active_record'
3
+ require_relative '../../../test_helper'
9
4
 
10
5
  require_relative '../../../helpers/controller_test_helpers'
11
6
  require_relative '../../../helpers/callback_tracer'
12
7
 
8
+ require 'view_model'
9
+ require 'view_model/active_record'
10
+
13
11
  class ViewModel::ActiveRecord::ControllerNestedTest < ActiveSupport::TestCase
14
12
  include ARVMTestUtilities
15
13
  include ControllerTestModels
@@ -1,15 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'minitest/autorun'
4
- require 'minitest/unit'
5
- require 'minitest/hooks'
6
-
7
- require 'view_model'
8
- require 'view_model/active_record'
3
+ require_relative '../../../test_helper'
9
4
 
10
5
  require_relative '../../../helpers/controller_test_helpers'
11
6
  require_relative '../../../helpers/callback_tracer'
12
7
 
8
+ require 'view_model'
9
+ require 'view_model/active_record'
10
+
13
11
  class ViewModel::ActiveRecord::ControllerTest < ActiveSupport::TestCase
14
12
  include ARVMTestUtilities
15
13
  include ControllerTestModels
@@ -1,10 +1,10 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require_relative '../../../test_helper'
4
+
3
5
  require_relative '../../../helpers/arvm_test_utilities'
4
6
  require_relative '../../../helpers/arvm_test_models'
5
7
 
6
- require 'minitest/autorun'
7
-
8
8
  require 'view_model/active_record'
9
9
 
10
10
  class ViewModel::ActiveRecord::CounterTest < ActiveSupport::TestCase