TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-24 03:14:03 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Updated old admin acceptance tests to E2E with AdminX" (#18604)

Browse Source 
Reverts TryGhost/Ghost#18599

There seems to be a timezone issue with one of the tests
This commit is contained in:
Jono M 2023-10-13 10:16:28 +01:00 committed by GitHub
parent b00388eb34
commit b75a6d0e7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
ghost/admin/tests/acceptance/editor-test.js
View File

@ -4,7 +4,6 @@ import sinon from 'sinon';
import {authenticateSession, invalidateSession} from 'ember-simple-auth/test-support';
import {beforeEach, describe, it} from 'mocha';
import {blur, click, currentRouteName, currentURL, fillIn, find, findAll, triggerEvent, typeIn} from '@ember/test-helpers';
import {datepickerSelect} from 'ember-power-datepicker/test-support';
import {expect} from 'chai';
import {selectChoose} from 'ember-power-select/test-support';
import {setupApplicationTest} from 'ember-mocha';
@ -120,70 +119,6 @@ describe('Acceptance: Editor', function () {
return await authenticateSession();
});
describe('post settings menu', function () {
it('can set publish date', async function () {
let [post1] = this.server.createList('post', 2, {authors: [author]});
let futureTime = moment().tz('Etc/UTC').add(10, 'minutes');
// sanity check
expect(
moment(post1.publishedAt).tz('Etc/UTC').format('YYYY-MM-DD HH:mm:ss'),
'initial publishedAt sanity check')
.to.equal('2015-12-19 16:25:07');
// post id 1 is a draft, checking for draft behaviour now
await visit('/editor/post/1');
// open post settings menu
await click('[data-test-psm-trigger]');
// should error, if the publish time is in the wrong format
await fillIn('[data-test-date-time-picker-time-input]', 'foo');
await blur('[data-test-date-time-picker-time-input]');
expect(find('[data-test-date-time-picker-error]').textContent.trim(), 'inline error response for invalid time')
.to.equal('Must be in format: "15:00"');
// should error, if the publish time is in the future
// NOTE: date must be selected first, changing the time first will save
// with the new time
await fillIn('[data-test-date-time-picker-datepicker] input', moment.tz('Etc/UTC').add(1, 'day').format('YYYY-MM-DD'));
await blur('[data-test-date-time-picker-datepicker] input');
await fillIn('[data-test-date-time-picker-time-input]', futureTime.format('HH:mm'));
await blur('[data-test-date-time-picker-time-input]');
expect(find('[data-test-date-time-picker-error]').textContent.trim(), 'inline error response for future time')
.to.equal('Must be in the past');
// closing the PSM will reset the invalid date/time
await click('[data-test-psm-trigger]');
await click('[data-test-psm-trigger]');
expect(
find('[data-test-date-time-picker-error]'),
'date picker error after closing PSM'
).to.not.exist;
expect(
find('[data-test-date-time-picker-date-input]').value,
'PSM date value after closing with invalid date'
).to.equal(moment(post1.publishedAt).tz('Etc/UTC').format('YYYY-MM-DD'));
expect(
find('[data-test-date-time-picker-time-input]').value,
'PSM time value after closing with invalid date'
).to.equal(moment(post1.publishedAt).tz('Etc/UTC').format('HH:mm'));
// saves the post with the new date
let validTime = moment('2017-04-09 12:00');
await fillIn('[data-test-date-time-picker-time-input]', validTime.format('HH:mm'));
await blur('[data-test-date-time-picker-time-input]');
await datepickerSelect('[data-test-date-time-picker-datepicker]', validTime.toDate());
expect(moment(post1.publishedAt).tz('Etc/UTC').format('YYYY-MM-DD HH:mm:ss')).to.equal('2017-04-09 12:00:00');
});
});
it.skip('handles title validation errors correctly', async function () {
this.server.create('post', {authors: [author]});

35
ghost/admin/tests/acceptance/editor/publish-flow-test.js
View File

@ -431,6 +431,41 @@ describe('Acceptance: Publish flow', function () {
it('can publish');
it('can schedule publish');
// TODO: Update to E2E test
// it('respects default recipient settings - usually nobody', async function () {
// // switch to "usually nobody" setting
// // - doing it this way so we're not testing potentially stale mocked setting keys/values
// await loginAsRole('Administrator', this.server);
// await visit('/settings/newsletters');
// await click('[data-test-toggle-membersemail]');
// await selectChoose('[data-test-select="default-recipients"]', 'Usually nobody');
// await click('[data-test-button="save-members-settings"]');
// const post = this.server.create('post', {status: 'draft'});
// await visit(`/editor/post/${post.id}`);
// await click('[data-test-button="publish-flow"]');
// expect(
// find('[data-test-setting="publish-type"] [data-test-setting-title]'), 'publish type title'
// ).to.have.trimmed.rendered.text('Publish');
// expect(
// find('[data-test-setting="email-recipients"] [data-test-setting-title]'), 'recipients title'
// ).to.have.trimmed.rendered.text('Not sent as newsletter');
// await click('[data-test-setting="publish-type"] [data-test-setting-title]');
// // email-related options are enabled
// expect(find('[data-test-publish-type="publish+send"]')).to.not.have.attribute('disabled');
// expect(find('[data-test-publish-type="send"]')).to.not.have.attribute('disabled');
// await click('[data-test-publish-type="publish+send"]');
// expect(
// find('[data-test-setting="email-recipients"] [data-test-setting-title]'), 'recipients title'
// ).to.have.trimmed.rendered.text('All 7 subscribers');
// });
it('handles Mailgun not being set up', async function () {
disableMailgun(this.server);

78
ghost/core/test/e2e-browser/admin/publishing.spec.js
View File

@ -554,82 +554,4 @@ test.describe('Updating post access', () => {
await expect(frontendPage.locator('.gh-post-upgrade-cta-content')).not.toBeVisible();
await expect(frontendPage.locator('.gh-content.gh-canvas > p')).toHaveText('Only gold members can see this');
});
test('publish time in timezone', async ({page}) => {
await page.goto('/ghost');
await createPostDraft(page, {title: 'Published in timezones', body: 'Published in timezones'});
await openPostSettingsMenu(page);
// saves the post with the new date
await page.locator('[data-test-date-time-picker-datepicker]').click();
await page.locator('.ember-power-calendar-nav-control--previous').click();
await page.locator('.ember-power-calendar-day', {hasText: '15'}).click();
await page.locator('[data-test-date-time-picker-time-input]').fill('12:00');
await publishPost(page);
await closePublishFlow(page);
// go to settings and change the timezone
await page.locator('[data-test-link="posts"]').click();
await page.locator('[data-test-nav="settings"]').click();
await expect(page.getByTestId('timezone')).toContainText('UTC');
await page.getByTestId('timezone').getByRole('button', {name: 'Edit'}).click();
await page.getByTestId('timezone-select').click();
await page.locator('[data-testid="select-option"]', {hasText: 'Kamchatka'}).click();
await page.getByTestId('timezone').getByRole('button', {name: 'Save'}).click();
await expect(page.getByTestId('timezone-select')).toBeHidden();
await expect(page.getByTestId('timezone')).toContainText('Pacific/Fiji');
await page.getByTestId('exit-settings').click();
await page.locator('[data-test-nav="posts"]').click();
await page.locator('[data-test-post-id]', {hasText: /Published in timezones/}).click();
await openPostSettingsMenu(page);
await expect(page.locator('[data-test-date-time-picker-date-input]')).toHaveValue(/-16$/);
await expect(page.locator('[data-test-date-time-picker-time-input]')).toHaveValue('00:00');
await expect(page.locator('[data-test-date-time-picker-timezone]')).toHaveText('+12');
});
test('default recipient settings - usually nobody', async ({page}) => {
// switch to "usually nobody" setting
await page.goto('/ghost/settings/newsletters');
await page.getByTestId('default-recipients').getByRole('button', {name: 'Edit'}).click();
await page.getByTestId('default-recipients-select').click();
await page.locator('[data-testid="select-option"]', {hasText: /Usually nobody/}).click();
await page.getByTestId('default-recipients').getByRole('button', {name: 'Save'}).click();
await expect(page.getByTestId('default-recipients-select')).toBeHidden();
await expect(page.getByTestId('default-recipients')).toContainText('Usually nobody');
await page.goto('/ghost');
await createMember(page, {
name: 'Test Member Recipient',
email: 'test@recipient.com'
});
// go to publish a post
await createPostDraft(page, {title: 'Published in timezones', body: 'Published in timezones'});
await page.locator('[data-test-button="publish-flow"]').click();
await expect(page.locator('[data-test-setting="publish-type"] [data-test-setting-title]')).toContainText('Publish');
await expect(page.locator('[data-test-setting="email-recipients"] [data-test-setting-title]')).toContainText('Not sent as newsletter');
await page.locator('[data-test-setting="publish-type"] [data-test-setting-title]').click();
// email-related options are enabled
await expect(page.locator('[data-test-publish-type="publish+send"]')).not.toBeDisabled();
await expect(page.locator('[data-test-publish-type="send"]')).not.toBeDisabled();
await page.locator('label[for="publish-type-publish+send"]').click();
await expect(
page.locator('[data-test-setting="email-recipients"] [data-test-setting-title]')
).toContainText(/\d+\s* subscriber/m);
});
});