From 05eb7db8e9418f283d107da2ff8b6156ef7ae47e Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Wed, 8 Aug 2018 17:00:46 +0100 Subject: [PATCH] Removed dated permalinks setting no issue - permalink config is now handled through `routes.yaml` --- app/controllers/settings/general.js | 15 ------ app/models/setting.js | 1 - app/templates/settings/general.hbs | 20 ------- mirage/fixtures/settings.js | 10 ---- tests/acceptance/settings/general-test.js | 19 +++---- .../unit/controllers/settings/general-test.js | 54 ------------------- 6 files changed, 7 insertions(+), 112 deletions(-) delete mode 100644 tests/unit/controllers/settings/general-test.js diff --git a/app/controllers/settings/general.js b/app/controllers/settings/general.js index d16545e51..8ff2e54ee 100644 --- a/app/controllers/settings/general.js +++ b/app/controllers/settings/general.js @@ -35,21 +35,6 @@ export default Controller.extend({ this.iconExtensions = ICON_EXTENSIONS; }, - isDatedPermalinks: computed('settings.permalinks', { - set(key, value) { - this.set('settings.permalinks', value ? '/:year/:month/:day/:slug/' : '/:slug/'); - - let slugForm = this.get('settings.permalinks'); - return slugForm !== '/:slug/'; - }, - - get() { - let slugForm = this.get('settings.permalinks'); - - return slugForm !== '/:slug/'; - } - }), - privateRSSUrl: computed('config.blogUrl', 'settings.publicHash', function () { let blogUrl = this.get('config.blogUrl'); let publicHash = this.get('settings.publicHash'); diff --git a/app/models/setting.js b/app/models/setting.js index b8afc0566..26e5d37c1 100644 --- a/app/models/setting.js +++ b/app/models/setting.js @@ -13,7 +13,6 @@ export default Model.extend(ValidationEngine, { icon: attr('string'), defaultLocale: attr('string'), forceI18n: attr('boolean'), - permalinks: attr('string'), activeTimezone: attr('string', {defaultValue: 'Etc/UTC'}), ghostHead: attr('string'), ghostFoot: attr('string'), diff --git a/app/templates/settings/general.hbs b/app/templates/settings/general.hbs index 57d374fd1..868734bb5 100644 --- a/app/templates/settings/general.hbs +++ b/app/templates/settings/general.hbs @@ -232,26 +232,6 @@
Advanced settings
-
-
-
Use dated permalinks
-
Include the date in your post URLs, e.g. blogurl.com/2017/01/01/post-title/
-
-
-
- -
-
-
Make this site private
diff --git a/mirage/fixtures/settings.js b/mirage/fixtures/settings.js index 98acc64e2..2abffe6be 100644 --- a/mirage/fixtures/settings.js +++ b/mirage/fixtures/settings.js @@ -60,16 +60,6 @@ export default [ updated_at: '2015-10-27T17:39:58.280Z', updated_by: 1 }, - { - id: 9, - key: 'permalinks', - value: '/:slug/', - type: 'blog', - created_at: '2014-01-14T12:01:51.000Z', - created_by: 1, - updated_at: '2015-10-27T17:39:58.282Z', - updated_by: 1 - }, { id: 10, created_at: '2015-09-11T09:44:30.809Z', diff --git a/tests/acceptance/settings/general-test.js b/tests/acceptance/settings/general-test.js index 3b9787262..d52e7086a 100644 --- a/tests/acceptance/settings/general-test.js +++ b/tests/acceptance/settings/general-test.js @@ -83,11 +83,6 @@ describe('Acceptance: Settings - General', function () { 'save button text' ).to.equal('Save settings'); - expect( - find('[data-test-dated-permalinks-checkbox]').prop('checked'), - 'date permalinks checkbox' - ).to.be.false; - await click('[data-test-toggle-pub-info]'); await fillIn('[data-test-title-input]', 'New Blog Title'); await click('[data-test-save-button]'); @@ -474,18 +469,18 @@ describe('Acceptance: Settings - General', function () { await visit('/settings/general'); expect( - find('[data-test-dated-permalinks-checkbox]').prop('checked'), - 'date permalinks checkbox' + find('[data-test-private-checkbox]').prop('checked'), + 'private blog checkbox' ).to.be.false; await click('[data-test-toggle-pub-info]'); await fillIn('[data-test-title-input]', 'New Blog Title'); - await click('[data-test-dated-permalinks-checkbox]'); + await click('[data-test-private-checkbox]'); expect( - find('[data-test-dated-permalinks-checkbox]').prop('checked'), - 'dated permalink checkbox' + find('[data-test-private-checkbox]').prop('checked'), + 'private blog checkbox' ).to.be.true; await visit('/settings/team'); @@ -503,8 +498,8 @@ describe('Acceptance: Settings - General', function () { // settings were not saved expect( - find('[data-test-dated-permalinks-checkbox]').prop('checked'), - 'date permalinks checkbox' + find('[data-test-private-checkbox]').prop('checked'), + 'private blog checkbox' ).to.be.false; expect( diff --git a/tests/unit/controllers/settings/general-test.js b/tests/unit/controllers/settings/general-test.js deleted file mode 100644 index c7f6220a2..000000000 --- a/tests/unit/controllers/settings/general-test.js +++ /dev/null @@ -1,54 +0,0 @@ -import EmberObject from '@ember/object'; -import {describe, it} from 'mocha'; -import {run} from '@ember/runloop'; -import {setupTest} from 'ember-mocha'; - -describe('Unit: Controller: settings/general', function () { - setupTest('controller:settings/general', { - needs: [ - 'service:config', - 'service:ghostPaths', - 'service:notifications', - 'service:session', - 'service:settings' - ] - }); - - it('isDatedPermalinks should be correct', function () { - let controller = this.subject({ - settings: EmberObject.create({ - permalinks: '/:year/:month/:day/:slug/' - }) - }); - - expect(controller.get('isDatedPermalinks')).to.be.ok; - - run(function () { - controller.set('settings.permalinks', '/:slug/'); - - expect(controller.get('isDatedPermalinks')).to.not.be.ok; - }); - }); - - it('setting isDatedPermalinks should switch between dated and slug', function () { - let controller = this.subject({ - settings: EmberObject.create({ - permalinks: '/:year/:month/:day/:slug/' - }) - }); - - run(function () { - controller.set('isDatedPermalinks', false); - - expect(controller.get('isDatedPermalinks')).to.not.be.ok; - expect(controller.get('settings.permalinks')).to.equal('/:slug/'); - }); - - run(function () { - controller.set('isDatedPermalinks', true); - - expect(controller.get('isDatedPermalinks')).to.be.ok; - expect(controller.get('settings.permalinks')).to.equal('/:year/:month/:day/:slug/'); - }); - }); -});