From 6f350b68d3a7cb110bd7a8490448822482e704c6 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Wed, 28 Mar 2018 18:37:53 -0700 Subject: [PATCH] fix content warning should delete when you hide it --- routes/_actions/contentWarnings.js | 6 +++++- tests/spec/015-compose-content-warnings.js | 18 +++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/routes/_actions/contentWarnings.js b/routes/_actions/contentWarnings.js index e84fa15..b9e535b 100644 --- a/routes/_actions/contentWarnings.js +++ b/routes/_actions/contentWarnings.js @@ -2,5 +2,9 @@ import { store } from '../_store/store' export function toggleContentWarningShown (realm) { let shown = store.getComposeData(realm, 'contentWarningShown') - store.setComposeData(realm, {contentWarningShown: !shown}) + let contentWarning = store.getComposeData(realm, 'contentWarning') + store.setComposeData(realm, { + contentWarning: shown ? contentWarning : '', + contentWarningShown: !shown + }) } diff --git a/tests/spec/015-compose-content-warnings.js b/tests/spec/015-compose-content-warnings.js index 88d590c..3a56912 100644 --- a/tests/spec/015-compose-content-warnings.js +++ b/tests/spec/015-compose-content-warnings.js @@ -52,17 +52,17 @@ test('Considers content warnings for length limits', async t => { .expect(composeLengthIndicator.innerText).eql('500') }) -test('Considers hidden content warnings for length limits', async t => { +test('Content warning goes away if you hide it', async t => { await t.useRole(foobarRole) + .click(contentWarningButton) + .expect(composeContentWarning.value).eql('') + .typeText(composeContentWarning, 'yo', {paste: true}) + .expect(composeContentWarning.value).eql('yo') + .expect(composeLengthIndicator.innerText).eql('498') + .click(contentWarningButton) + .expect(composeContentWarning.exists).notOk() .expect(composeLengthIndicator.innerText).eql('500') .click(contentWarningButton) - .typeText(composeContentWarning, 'my content warning', {paste: true}) - .expect(composeLengthIndicator.innerText).eql('482') - .click(contentWarningButton) - .expect(composeLengthIndicator.innerText).eql('500') - .click(contentWarningButton) - .expect(composeLengthIndicator.innerText).eql('482') - .selectText(composeContentWarning) - .pressKey('delete') + .expect(composeContentWarning.value).eql('') .expect(composeLengthIndicator.innerText).eql('500') })