Make this site private
diff --git a/ghost/admin/mirage/fixtures/settings.js b/ghost/admin/mirage/fixtures/settings.js
index 98acc64e2a..2abffe6bec 100644
--- a/ghost/admin/mirage/fixtures/settings.js
+++ b/ghost/admin/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/ghost/admin/tests/acceptance/settings/general-test.js b/ghost/admin/tests/acceptance/settings/general-test.js
index 3b97872622..d52e7086a4 100644
--- a/ghost/admin/tests/acceptance/settings/general-test.js
+++ b/ghost/admin/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/ghost/admin/tests/unit/controllers/settings/general-test.js b/ghost/admin/tests/unit/controllers/settings/general-test.js
deleted file mode 100644
index c7f6220a20..0000000000
--- a/ghost/admin/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/');
- });
- });
-});