From 304884cd9a7cafe183b5582f2d85b3bb4b18559c Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Thu, 29 Jun 2023 19:15:03 -0400
Subject: [PATCH] Unskip some core-resolver tests

These were successfully implemented earlier.
---
 tests/scenarios/core-resolver-test.ts | 30 +++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/tests/scenarios/core-resolver-test.ts b/tests/scenarios/core-resolver-test.ts
index 9f3646a46..cead31852 100644
--- a/tests/scenarios/core-resolver-test.ts
+++ b/tests/scenarios/core-resolver-test.ts
@@ -1,4 +1,4 @@
-import { AddonMeta, AppMeta } from '@embroider/shared-internals';
+import { AddonMeta, AppMeta, RewrittenPackageIndex } from '@embroider/shared-internals';
 import { outputFileSync } from 'fs-extra';
 import { resolve } from 'path';
 import QUnit from 'qunit';
@@ -686,13 +686,15 @@ Scenarios.fromProject(() => new Project())
       });
 
       Qmodule('legacy-addons', function () {
-        QUnit.skip('app can resolve file in rewritten addon', async function () {
+        test('app can resolve file in rewritten addon', async function () {
+          let index: RewrittenPackageIndex = {
+            packages: {
+              [resolve(app.dir, 'node_modules/my-addon')]: 'my-addon.1234',
+            },
+            extraResolutions: {},
+          };
           givenFiles({
-            'node_modules/.embroider/rewritten-packages/index.json': JSON.stringify({
-              packages: {
-                [resolve(app.dir, 'node_modules/my-addon')]: 'my-addon.1234',
-              },
-            }),
+            'node_modules/.embroider/rewritten-packages/index.json': JSON.stringify(index),
             'node_modules/.embroider/rewritten-packages/my-addon.1234/hello-world.js': ``,
             'node_modules/.embroider/rewritten-packages/my-addon.1234/package.json': addonPackageJSON(),
             'app.js': `import "my-addon/hello-world"`,
@@ -706,14 +708,16 @@ Scenarios.fromProject(() => new Project())
             .to('./node_modules/.embroider/rewritten-packages/my-addon.1234/hello-world.js');
         });
 
-        QUnit.skip('moved addon resolves dependencies from its original location', async function () {
+        test('moved addon resolves dependencies from its original location', async function () {
+          let index: RewrittenPackageIndex = {
+            packages: {
+              [resolve(app.dir, 'node_modules/my-addon')]: 'my-addon.1234',
+            },
+            extraResolutions: {},
+          };
           givenFiles({
             'node_modules/my-addon/node_modules/inner-dep/index.js': '',
-            'node_modules/.embroider/rewritten-packages/index.json': JSON.stringify({
-              packages: {
-                [resolve(app.dir, 'node_modules/my-addon')]: 'my-addon.1234',
-              },
-            }),
+            'node_modules/.embroider/rewritten-packages/index.json': JSON.stringify(index),
             'node_modules/.embroider/rewritten-packages/my-addon.1234/hello-world.js': `import "inner-dep"`,
             'node_modules/.embroider/rewritten-packages/my-addon.1234/package.json': addonPackageJSON(),
             'app.js': `import "my-addon/hello-world"`,