diff --git a/packages/endpoint-micropub/lib/microformats.js b/packages/endpoint-micropub/lib/microformats.js index d6f5d3dd6..aea51d763 100644 --- a/packages/endpoint-micropub/lib/microformats.js +++ b/packages/endpoint-micropub/lib/microformats.js @@ -197,7 +197,7 @@ export const getPublishedProperty = mf2 => { * @returns {Array} Array containing slug value */ export const getSlugProperty = (mf2, separator) => { - const suggested = mf2.properties['mp-slug'] || mf2.properties.slug; + const suggested = mf2.properties['mp-slug']; const {name} = mf2.properties; let string; diff --git a/packages/endpoint-micropub/tests/fixtures/mp-slug-provided-empty.json b/packages/endpoint-micropub/tests/fixtures/mp-slug-provided-empty.json deleted file mode 100644 index ab189e086..000000000 --- a/packages/endpoint-micropub/tests/fixtures/mp-slug-provided-empty.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": ["h-entry"], - "properties": { - "name": ["I ate a cheese sandwich, which was nice."], - "mp-slug": [""] - } -} diff --git a/packages/endpoint-micropub/tests/fixtures/mp-slug-provided.json b/packages/endpoint-micropub/tests/fixtures/mp-slug-provided.json deleted file mode 100644 index 2fe5d980c..000000000 --- a/packages/endpoint-micropub/tests/fixtures/mp-slug-provided.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": ["h-entry"], - "properties": { - "name": ["I ate a cheese sandwich, which was nice."], - "mp-slug": ["cheese-sandwich"] - } -} diff --git a/packages/endpoint-micropub/tests/fixtures/slug-provided-empty.json b/packages/endpoint-micropub/tests/fixtures/slug-provided-empty.json index afa61634e..ab189e086 100644 --- a/packages/endpoint-micropub/tests/fixtures/slug-provided-empty.json +++ b/packages/endpoint-micropub/tests/fixtures/slug-provided-empty.json @@ -2,6 +2,6 @@ "type": ["h-entry"], "properties": { "name": ["I ate a cheese sandwich, which was nice."], - "slug": [""] + "mp-slug": [""] } } diff --git a/packages/endpoint-micropub/tests/fixtures/mp-slug-provided-unslugified.json b/packages/endpoint-micropub/tests/fixtures/slug-provided-unslugified.json similarity index 100% rename from packages/endpoint-micropub/tests/fixtures/mp-slug-provided-unslugified.json rename to packages/endpoint-micropub/tests/fixtures/slug-provided-unslugified.json diff --git a/packages/endpoint-micropub/tests/fixtures/slug-provided.json b/packages/endpoint-micropub/tests/fixtures/slug-provided.json index e60565c6a..2fe5d980c 100644 --- a/packages/endpoint-micropub/tests/fixtures/slug-provided.json +++ b/packages/endpoint-micropub/tests/fixtures/slug-provided.json @@ -2,6 +2,6 @@ "type": ["h-entry"], "properties": { "name": ["I ate a cheese sandwich, which was nice."], - "slug": ["cheese-sandwich"] + "mp-slug": ["cheese-sandwich"] } } diff --git a/packages/endpoint-micropub/tests/lib/microformats.js b/packages/endpoint-micropub/tests/lib/microformats.js index 9eea287e9..79036e7c6 100644 --- a/packages/endpoint-micropub/tests/lib/microformats.js +++ b/packages/endpoint-micropub/tests/lib/microformats.js @@ -185,32 +185,20 @@ test('Gets date by using current date', t => { t.true(isValid(parseISO(result[0]))); }); -test('Derives slug from `slug` property', t => { - const mf2 = JSON.parse(getFixture('slug-provided.json')); - const slug = getSlugProperty(mf2, '-'); - t.is(slug[0], 'cheese-sandwich'); -}); - test('Derives slug from `mp-slug` property', t => { - const mf2 = JSON.parse(getFixture('mp-slug-provided.json')); + const mf2 = JSON.parse(getFixture('slug-provided.json')); const slug = getSlugProperty(mf2, '-'); t.is(slug[0], 'cheese-sandwich'); }); test('Derives slug from unslugified `mp-slug` property', t => { - const mf2 = JSON.parse(getFixture('mp-slug-provided-unslugified.json')); + const mf2 = JSON.parse(getFixture('slug-provided-unslugified.json')); const slug = getSlugProperty(mf2, '-'); t.is(slug[0], 'cheese-sandwich'); }); -test('Derives slug, ignoring empty `slug` property', t => { - const mf2 = JSON.parse(getFixture('slug-provided-empty.json')); - const slug = getSlugProperty(mf2, '-'); - t.is(slug[0], 'i-ate-a-cheese-sandwich'); -}); - test('Derives slug, ignoring empty `mp-slug` property', t => { - const mf2 = JSON.parse(getFixture('mp-slug-provided-empty.json')); + const mf2 = JSON.parse(getFixture('slug-provided-empty.json')); const slug = getSlugProperty(mf2, '-'); t.is(slug[0], 'i-ate-a-cheese-sandwich'); });