Merge branch 'patch-1' into 'develop'

Update compose-test.js to accommodate decoupling of CW toggle from sensitive (NSFW) assignment

See merge request soapbox-pub/soapbox-fe!106

app/soapbox/reducers/__tests__/compose-test.js

@@ -168,20 +168,8 @@ describe('compose reducer', () => {
     });
   });
 
-  //Remove this test once spoiler is decoupled from marking media as sensitive
-  it('should handle COMPOSE_SENSITIVITY_CHANGE on Mark Sensitive click, don\'t toggle if spoiler active', () => {
-    const state = ImmutableMap({ spoiler: true, sensitive: true, idempotencyKey: null });
-    const action = {
-      type: actions.COMPOSE_SENSITIVITY_CHANGE,
-    };
-    expect(reducer(state, action).toJS()).toMatchObject({
-      sensitive: true,
-    });
-  });
-
-  //Edit this test to not pass spoiler state once spoiler is decoupled from marking media as sensitive
   it('should handle COMPOSE_SENSITIVITY_CHANGE on Mark Sensitive click, toggle if spoiler inactive', () => {
-    const state = ImmutableMap({ spoiler: false, sensitive: true });
+    const state = ImmutableMap({ sensitive: true });
     const action = {
       type: actions.COMPOSE_SENSITIVITY_CHANGE,
     };