From 584106bc5fd13668d2246c5c7afb0f2216d1d99a Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Wed, 16 Jun 2021 14:57:34 -0700 Subject: [PATCH 1/4] Add changelog for #3499 --- CHANGELOG.md | 1 + src/test/extensions/updateHelper.spec.ts | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29bb2d..354c12b7160 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1 @@ +- Fix ext:update issue where local extension is incorrectly inferred as published (#3499) \ No newline at end of file diff --git a/src/test/extensions/updateHelper.spec.ts b/src/test/extensions/updateHelper.spec.ts index 42a7777aa29..4b927585df3 100644 --- a/src/test/extensions/updateHelper.spec.ts +++ b/src/test/extensions/updateHelper.spec.ts @@ -599,12 +599,14 @@ describe("getExistingSourceOrigin", () => { isOfficialStub = sinon.stub(resolveSource, "isOfficialSource"); isOfficialStub.returns(true); getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(INSTANCE); + const result = await updateHelper.getExistingSourceOrigin( "invader-zim", "instance-of-official-ext", "ext-testing", "projects/firebasemods/sources/fake-official-source" ); + expect(result).to.equal(extensionsHelper.SourceOrigin.OFFICIAL_EXTENSION); }); @@ -612,12 +614,14 @@ describe("getExistingSourceOrigin", () => { registryEntryStub = sinon.stub(resolveSource, "resolveRegistryEntry"); registryEntryStub.throwsException("Entry not found"); getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(REGISTRY_INSTANCE); + const result = await updateHelper.getExistingSourceOrigin( "invader-zim", "instance-of-registry-ext", "ext-testing", "projects/firebasemods/sources/fake-registry-source" ); + expect(result).to.equal(extensionsHelper.SourceOrigin.PUBLISHED_EXTENSION); }); @@ -625,12 +629,14 @@ describe("getExistingSourceOrigin", () => { registryEntryStub = sinon.stub(resolveSource, "resolveRegistryEntry"); registryEntryStub.throwsException("Entry not found"); getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(LOCAL_INSTANCE); + const result = await updateHelper.getExistingSourceOrigin( "invader-zim", "instance-of-local-ext", "ext-testing", "projects/firebasemods/sources/fake-local-source" ); + expect(result).to.equal(extensionsHelper.SourceOrigin.LOCAL); }); @@ -640,12 +646,14 @@ describe("getExistingSourceOrigin", () => { isOfficialStub = sinon.stub(resolveSource, "isOfficialSource"); isOfficialStub.returns(false); getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(LOCAL_INSTANCE); + const result = await updateHelper.getExistingSourceOrigin( "invader-zim", "instance-of-local-ext", "ext-testing", "projects/firebasemods/sources/fake-local-source" ); + expect(result).to.equal(extensionsHelper.SourceOrigin.LOCAL); }); }); From 02c173019e6988e3a412ab0935942119efc39a1f Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Wed, 16 Jun 2021 15:40:36 -0700 Subject: [PATCH 2/4] Fix lint --- CHANGELOG.md | 2 +- src/test/extensions/updateHelper.spec.ts | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 354c12b7160..f738a05f86d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -- Fix ext:update issue where local extension is incorrectly inferred as published (#3499) \ No newline at end of file +- Fix ext:update issue where local extension is incorrectly inferred as published (#3499) diff --git a/src/test/extensions/updateHelper.spec.ts b/src/test/extensions/updateHelper.spec.ts index 4b927585df3..03a8e8a9c5b 100644 --- a/src/test/extensions/updateHelper.spec.ts +++ b/src/test/extensions/updateHelper.spec.ts @@ -599,14 +599,14 @@ describe("getExistingSourceOrigin", () => { isOfficialStub = sinon.stub(resolveSource, "isOfficialSource"); isOfficialStub.returns(true); getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(INSTANCE); - + const result = await updateHelper.getExistingSourceOrigin( "invader-zim", "instance-of-official-ext", "ext-testing", "projects/firebasemods/sources/fake-official-source" ); - + expect(result).to.equal(extensionsHelper.SourceOrigin.OFFICIAL_EXTENSION); }); @@ -614,14 +614,14 @@ describe("getExistingSourceOrigin", () => { registryEntryStub = sinon.stub(resolveSource, "resolveRegistryEntry"); registryEntryStub.throwsException("Entry not found"); getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(REGISTRY_INSTANCE); - + const result = await updateHelper.getExistingSourceOrigin( "invader-zim", "instance-of-registry-ext", "ext-testing", "projects/firebasemods/sources/fake-registry-source" ); - + expect(result).to.equal(extensionsHelper.SourceOrigin.PUBLISHED_EXTENSION); }); @@ -629,14 +629,14 @@ describe("getExistingSourceOrigin", () => { registryEntryStub = sinon.stub(resolveSource, "resolveRegistryEntry"); registryEntryStub.throwsException("Entry not found"); getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(LOCAL_INSTANCE); - + const result = await updateHelper.getExistingSourceOrigin( "invader-zim", "instance-of-local-ext", "ext-testing", "projects/firebasemods/sources/fake-local-source" ); - + expect(result).to.equal(extensionsHelper.SourceOrigin.LOCAL); }); @@ -646,14 +646,14 @@ describe("getExistingSourceOrigin", () => { isOfficialStub = sinon.stub(resolveSource, "isOfficialSource"); isOfficialStub.returns(false); getInstanceStub = sinon.stub(extensionsApi, "getInstance").resolves(LOCAL_INSTANCE); - + const result = await updateHelper.getExistingSourceOrigin( "invader-zim", "instance-of-local-ext", "ext-testing", "projects/firebasemods/sources/fake-local-source" ); - + expect(result).to.equal(extensionsHelper.SourceOrigin.LOCAL); }); }); From b7dbe81e56a6c69695adaa1de2c0ca5e59504a44 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Wed, 16 Jun 2021 15:41:54 -0700 Subject: [PATCH 3/4] use active voice in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f738a05f86d..2a0be775f4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -- Fix ext:update issue where local extension is incorrectly inferred as published (#3499) +- Fixes an issue with ext:update where local extension is incorrectly inferred as published (#3499) \ No newline at end of file From f678eb4eb3ac287ea70e536fcbb8ada455c80690 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Wed, 16 Jun 2021 15:48:34 -0700 Subject: [PATCH 4/4] Fix lint --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a0be775f4e..3adcb5c76ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -- Fixes an issue with ext:update where local extension is incorrectly inferred as published (#3499) \ No newline at end of file +- Fixes an issue with ext:update where local extension is incorrectly inferred as published (#3499)