wip

Author: solnic

spec/integration/rom/factory_spec.rb

@@ -165,18 +165,18 @@
           end
 
           conf.relation(:basic_users) do
-            schema(infer: true) do
-              associations do
-                has_one :basic_account
-              end
+            schema(infer: true)
+
+            associations do
+              has_one :basic_account
             end
           end
 
           conf.relation(:basic_accounts) do
-            schema(infer: true) do
-              associations do
-                belongs_to :basic_user
-              end
+            schema(infer: true)
+
+            associations do
+              belongs_to :basic_user
             end
           end
         end
@@ -1194,10 +1194,10 @@ class User < ROM::Struct
           attribute :title, ROM::SQL::Types::String.meta(
             read: ROM::SQL::Types::String.constructor(&:upcase)
           )
+        end
 
-          associations do
-            belongs_to :user
-          end
+        associations do
+          belongs_to :user
         end
       end
     end

spec/shared/database.rb

@@ -12,7 +12,7 @@
   end
 
   let(:conn) do
-    rom.gateways[:default].connection
+    conf.registry.gateways[:default].connection
   end
 
   let(:relations) do

spec/shared/relations.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rom/compat'
+
 RSpec.shared_context 'relations' do
   include_context 'database'
 
@@ -39,48 +41,48 @@
     end
 
     conf.relation(:tasks) do
-      schema(infer: true) do
-        associations do
-          belongs_to :user
-        end
+      schema(infer: true)
+
+      associations do
+        belongs_to :user
       end
     end
 
     conf.relation(:users) do
-      schema(infer: true) do
-        associations do
-          has_many :tasks
-          has_one :user_addresses
-          has_one :address, through: :user_addresses
-        end
+      schema(infer: true)
+
+      associations do
+        has_many :tasks
+        has_one :user_addresses
+        has_one :address, through: :user_addresses
       end
     end
 
     conf.relation(:addresses) do
-      schema(infer: true) do
-        associations do
-          has_one :user_addresses
-          has_one :user, through: :user_addresses
-        end
+      schema(infer: true)
+
+      associations do
+        has_one :user_addresses
+        has_one :user, through: :user_addresses
       end
     end
 
     conf.relation(:user_addresses) do
-      schema(infer: true) do
-        associations do
-          belongs_to :user
-          belongs_to :address
-        end
+      schema(infer: true)
+
+      associations do
+        belongs_to :user
+        belongs_to :address
       end
     end
 
     conf.relation(:admins) do
       dataset { where(type: "Admin") }
 
-      schema(:users, as: :admins, infer: true) do
-        associations do
-          has_many :tasks
-        end
+      schema(:users, as: :admins, infer: true)
+
+      associations do
+        has_many :tasks
       end
     end
 

spec/unit/rom/factory/builder_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'rom/factory/builder'
-
 RSpec.describe ROM::Factory::Builder do
   subject(:builder) do
     ROM::Factory::Builder.new(ROM::Factory::AttributeRegistry.new(attributes),
@@ -72,10 +70,10 @@
       end
 
       conf.relation(:tasks) do
-        schema(infer: true) do
-          associations do
-            belongs_to :user
-          end
+        schema(infer: true)
+
+        associations do
+          belongs_to :user
         end
       end
 
@@ -155,27 +153,27 @@
       end
 
       conf.relation(:users) do
-        schema(infer: true) do
-          associations do
-            has_many :users, through: :users_tasks
-          end
+        schema(infer: true)
+
+        associations do
+          has_many :users, through: :users_tasks
         end
       end
 
       conf.relation(:tasks) do
-        schema(infer: true) do
-          associations do
-            has_many :users, through: :users_tasks
-          end
+        schema(infer: true)
+
+        associations do
+          has_many :users, through: :users_tasks
         end
       end
 
       conf.relation(:users_tasks) do
-        schema(infer: true) do
-          associations do
-            belongs_to :user
-            belongs_to :task
-          end
+        schema(infer: true)
+
+        associations do
+          belongs_to :user
+          belongs_to :task
         end
       end
 
@@ -227,18 +225,18 @@
       end
 
       conf.relation(:tasks) do
-        schema(infer: true) do
-          associations do
-            belongs_to :user
-          end
+        schema(infer: true)
+
+        associations do
+          belongs_to :user
         end
       end
 
       conf.relation(:users) do
-        schema(infer: true) do
-          associations do
-            has_many :tasks
-          end
+        schema(infer: true)
+
+        associations do
+          has_many :tasks
         end
       end
 
@@ -293,18 +291,18 @@
       end
 
       conf.relation(:tasks) do
-        schema(infer: true) do
-          associations do
-            belongs_to :user
-          end
+        schema(infer: true)
+
+        associations do
+          belongs_to :user
         end
       end
 
       conf.relation(:users) do
-        schema(infer: true) do
-          associations do
-            has_one :task
-          end
+        schema(infer: true)
+
+        associations do
+          has_one :task
         end
       end