passing craft 5 tests

markhuot · Mar 20, 2024 · 030c2e9 · 030c2e9
1 parent abafb54
commit 030c2e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/factories/Entry.php b/src/factories/Entry.php
@@ -198,8 +198,13 @@ public function newElement()
      */
     public function inferences(array $definition = [])
     {
-        $sectionId = $this->inferSectionId();
-        $typeId = $this->inferTypeId($sectionId);
+        if (empty($this->entryTypeIdentifier)) {
+            $sectionId = $this->inferSectionId();
+            $typeId = $this->inferTypeId($sectionId);
+        } else {
+            $sectionId = null;
+            $typeId = \Craft::$app->getEntries()->getEntryTypeByHandle($this->entryTypeIdentifier)->id;
+        }
 
         return array_merge($definition, [
             'sectionId' => $sectionId,

diff --git a/tests/FactoryFieldTest.php b/tests/FactoryFieldTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
 use markhuot\craftpest\factories\Entry;
 use markhuot\craftpest\factories\Field;
 use markhuot\craftpest\factories\Section;
@@ -24,9 +26,9 @@
     expect(\craft\elements\Entry::find()->count())->toBe($entryCount);
 });
 
-it('errors when trying to create fields after content elements', function () {
+it('errors when trying to create fields after content elements in Craft 4', function () {
     $this->expectException(\markhuot\craftpest\exceptions\AutoCommittingFieldsException::class);
 
     Section::factory()->create();
     Field::factory()->type(\craft\fields\PlainText::class)->create();
-});
+})->skip(InstalledVersions::satisfies(new VersionParser, 'craftcms/cms', '>=5.0.0'));