Merge 1cb9725 into 60d41ec

notEthan · Sep 30, 2021 · 58826ce · 58826ce
2 parents 60d41ec + 1cb9725
commit 58826ce
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/lib/jsi/schema/application/child_application/contains.rb b/lib/jsi/schema/application/child_application/contains.rb
@@ -7,7 +7,7 @@ def internal_applicate_contains(idx, instance, &block)
       if schema_content.key?('contains')
         contains_schema = subschema(['contains'])
 
-        if contains_schema.instance_valid?(instance[idx])
+        if contains_schema.validate_instance(instance[idx])
           yield contains_schema
         end
       end

diff --git a/test/schema_child_application_test.rb b/test/schema_child_application_test.rb
@@ -74,6 +74,53 @@
       end
     end
   end
+  {
+    draft06: JSI::JSONSchemaOrgDraft06,
+  }.each do |name, metaschema|
+    describe "#{name} contains application" do
+      let(:metaschema) { metaschema }
+      describe 'contains valid' do
+        let(:schema_content) do
+          YAML.load(<<~YAML
+            contains:
+              type: array
+            YAML
+          )
+        end
+        let(:instance) { [{}, [], [], {}] }
+        it 'applies' do
+          refute_is_a(JSI::Base, subject[0])
+          assert_equal(Set[
+            schema.contains,
+          ], subject[1].jsi_schemas)
+          assert_equal(Set[
+            schema.contains,
+          ], subject[2].jsi_schemas)
+          refute_is_a(JSI::Base, subject[3])
+          refute_is_a(schema.contains.jsi_schema_module, subject[0])
+          assert_is_a(schema.contains.jsi_schema_module, subject[1])
+          assert_is_a(schema.contains.jsi_schema_module, subject[2])
+          refute_is_a(schema.contains.jsi_schema_module, subject[3])
+        end
+      end
+      describe 'contains invalid' do
+        let(:schema_content) do
+          YAML.load(<<~YAML
+            contains:
+              type: array
+            YAML
+          )
+        end
+        let(:instance) { [{}, {}] }
+        it 'does not apply' do
+          refute_is_a(JSI::Base, subject[0])
+          refute_is_a(JSI::Base, subject[1])
+          refute_is_a(schema.contains.jsi_schema_module, subject[0])
+          refute_is_a(schema.contains.jsi_schema_module, subject[1])
+        end
+      end
+    end
+  end
   {
     draft04: JSI::JSONSchemaOrgDraft04,
     draft06: JSI::JSONSchemaOrgDraft06,