Fix removing cookie after close success toaster.

stepek · stepek · commit 49720111fba3 · 2020-01-02T11:37:13.000+01:00
CW-1927
diff --git a/package.json b/package.json
@@ -152,6 +152,7 @@
     "redux-observable": "^0.14.0",
     "redux-thunk": "^2.1.0",
     "reselect": "^2.5.4",
-    "rxjs": "^5.2.0"
+    "rxjs": "^5.2.0",
+    "mock-socket": "latest"
   }
 }
diff --git a/src/SuccessToaster/components/WebSocketTerminal.jsx b/src/SuccessToaster/components/WebSocketTerminal.jsx
@@ -1,3 +1,4 @@
+/* globals document */
 import React, {Component} from 'react';
 
 import Console from '../../components/Console';
@@ -45,13 +46,15 @@ export class WebSocketTerminal extends Component {
   componentDidMount() {
     const {url, authToken} = this.props;
 
-    document.cookie = `Auth-Token=${authToken}; path=/`; // eslint-disable-line no-undef
+    document.cookie = `Auth-Token=${authToken}; path=/`;
 
     this.setConnection(url);
   }
 
   componentWillUnmount() {
     this.closeConnection();
+
+    document.cookie = 'Auth-Token= ; path=/; expires = Thu, 01 Jan 1970 00:00:00 GMT';
   }
 
   setConnection = url => {
diff --git a/src/SuccessToaster/components/WebSocketTerminal.test.js b/src/SuccessToaster/components/WebSocketTerminal.test.js
@@ -0,0 +1,29 @@
+/* global it, describe, document */
+import React from 'react';
+import chai from 'chai';
+import chaiEnzyme from 'chai-enzyme';
+import {mount} from 'enzyme';
+
+import WebSocketTerminal from './WebSocketTerminal';
+
+chai.use(chaiEnzyme());
+chai.should();
+
+describe('WebSocketTerminal', () => {
+  describe('componentDidMount', () => {
+    it('should set cookie', () => {
+      mount(<WebSocketTerminal url={'https://localhost:6123'} authToken={'SampleAuthToken'}/>);
+
+      document.cookie.should.equal('Auth-Token=SampleAuthToken');
+    });
+  });
+
+  describe('componentWillUnmount', () => {
+    it('should remove cookie', () => {
+      const wrapper = mount(<WebSocketTerminal url={'https://localhost:6123'} authToken={'SampleAuthToken'}/>);
+      wrapper.unmount();
+
+      document.cookie.should.equal('');
+    });
+  });
+});
diff --git a/src/api/index.js b/src/api/index.js
@@ -244,7 +244,7 @@ export const createWebSocket = (url, events = {
     url = url.replace('http', 'ws'); // todo: add ^
   }
 
-  const ws = new WebSocket(url); // eslint-disable-line
+  const ws = new window.WebSocket(url); // eslint-disable-line
 
   ws.addEventListener('open', events.onOpen);
   ws.addEventListener('message', events.onMessage);
diff --git a/test/helpers/dom.js b/test/helpers/dom.js
@@ -1,5 +1,6 @@
 require('mock-local-storage');
 var jsdom = require('jsdom');
+var mockSocket = require('mock-socket');
 
 // setup the simplest document possible
 var doc = jsdom.jsdom('<!doctype html><html><body></body></html>', {url: 'http://localhost/'});
@@ -8,6 +9,7 @@ var win = doc.defaultView;
 // set globals for mocha that make access to document and window feel
 // natural in the test environment
 global.document = doc;
+global.WebSocket = mockSocket.WebSocket;
 global.window = win;
 
 // take all properties of the window object and also attach it to the
@@ -30,4 +32,5 @@ function propagateToGlobal(window) {
   }
   window.sessionStorage = global.sessionStorage;
   window.localStorage = global.localStorage;
+  window.WebSocket = global.WebSocket;
 }

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@`
`152`	`152`	`"redux-observable": "^0.14.0",`
`153`	`153`	`"redux-thunk": "^2.1.0",`
`154`	`154`	`"reselect": "^2.5.4",`
`155`		`- "rxjs": "^5.2.0"`
	`155`	`+ "rxjs": "^5.2.0",`
	`156`	`+ "mock-socket": "latest"`
`156`	`157`	`}`
`157`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ export const createWebSocket = (url, events = {`
`244`	`244`	`url = url.replace('http', 'ws'); // todo: add ^`
`245`	`245`	`}`
`246`	`246`
`247`		`- const ws = new WebSocket(url); // eslint-disable-line`
	`247`	`+ const ws = new window.WebSocket(url); // eslint-disable-line`
`248`	`248`
`249`	`249`	`ws.addEventListener('open', events.onOpen);`
`250`	`250`	`ws.addEventListener('message', events.onMessage);`