From 3a3bf6f5907cc136ef549fd59df42cf36b5ca972 Mon Sep 17 00:00:00 2001
From: Yuri S <yuri@blazemeter.com>
Date: Tue, 19 Dec 2017 11:17:29 +0200
Subject: [PATCH 1/6] Fixed two warnings on running tests

---
 test/AsyncCreatable-test.js | 3 +--
 test/Creatable-test.js      | 6 ++----
 test/Select-test.js         | 2 ++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/AsyncCreatable-test.js b/test/AsyncCreatable-test.js
index 514a40bd8e..c891f981f5 100644
--- a/test/AsyncCreatable-test.js
+++ b/test/AsyncCreatable-test.js
@@ -19,11 +19,10 @@ var sinon = require('sinon');
 var Select = require('../src');
 
 describe('AsyncCreatable', () => {
-	let creatableInstance, creatableNode, filterInputNode, loadOptions, renderer;
+	let creatableInstance, creatableNode, filterInputNode, loadOptions;
 
 	beforeEach(() => {
 		loadOptions = sinon.stub();
-		renderer = TestUtils.createRenderer();
 	});
 
 	function createControl (props = {}) {
diff --git a/test/Creatable-test.js b/test/Creatable-test.js
index 5a58726e3a..488eb1f78f 100644
--- a/test/Creatable-test.js
+++ b/test/Creatable-test.js
@@ -19,9 +19,7 @@ var TestUtils = require('react-dom/test-utils');
 var Select = require('../src');
 
 describe('Creatable', () => {
-	let creatableInstance, creatableNode, filterInputNode, innerSelectInstance, renderer;
-
-	beforeEach(() => renderer = TestUtils.createRenderer());
+	let creatableInstance, creatableNode, filterInputNode, innerSelectInstance;
 
 	const defaultOptions = [
 		{ value: 'one', label: 'One' },
@@ -221,7 +219,7 @@ describe('Creatable', () => {
 		expect(test(newOption('qux', 4)), 'to be', true);
 		expect(test(newOption('Foo', 11)), 'to be', true);
 	});
-	
+
 	it('default: isOptionUnique function should always return true if given options are empty', () => {
 		const options = [];
 
diff --git a/test/Select-test.js b/test/Select-test.js
index 3b00677e4d..5bee909129 100644
--- a/test/Select-test.js
+++ b/test/Select-test.js
@@ -4465,6 +4465,8 @@ describe('Select', () => {
 				options: defaultOptions,
 			});
 			expect(warn, 'was called once');
+
+			warn.restore();
 		});
 	});
 	describe('rtl', () => {

From 15651643f6522c2792515a40d38ec3329d55aacd Mon Sep 17 00:00:00 2001
From: Yuri S <yuri@blazemeter.com>
Date: Tue, 19 Dec 2017 11:28:49 +0200
Subject: [PATCH 2/6] Fixed autofocus warnings

---
 test/Select-test.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/Select-test.js b/test/Select-test.js
index 5bee909129..356b5fafeb 100644
--- a/test/Select-test.js
+++ b/test/Select-test.js
@@ -4435,31 +4435,37 @@ describe('Select', () => {
 				autoFocus: true,
 				options: defaultOptions,
 			});
-			var input = ReactDOM.findDOMNode(instance.input).querySelector('input');
+			const input = ReactDOM.findDOMNode(instance.input).querySelector('input');
 			expect(input, 'to equal', document.activeElement);
 		});
 		it('with autofocus as well, calls focus() only once', () => {
+			const warn = sinon.stub(console, 'warn');
 			wrapper = createControl({
 				autofocus: true,
 				autoFocus: true,
 				options: defaultOptions,
 			});
-			var focus = sinon.spy(instance, 'focus');
+			const focus = sinon.spy(instance, 'focus');
 			instance.componentDidMount();
 			expect(focus, 'was called once');
+
+			warn.restore();
 		});
 	});
 	describe('with autofocus', () => {
 		it('focuses the select input on mount', () => {
+			const warn = sinon.stub(console, 'warn');
 			wrapper = createControl({
 				autofocus: true,
 				options: defaultOptions,
 			});
-			var input = ReactDOM.findDOMNode(instance.input).querySelector('input');
+			const input = ReactDOM.findDOMNode(instance.input).querySelector('input');
 			expect(input, 'to equal', document.activeElement);
+
+			warn.restore();
 		});
 		it('calls console.warn', () => {
-			var warn = sinon.spy(console, 'warn');
+			const warn = sinon.stub(console, 'warn');
 			wrapper = createControl({
 				autofocus: true,
 				options: defaultOptions,

From 2823b8186a911e115f93ae24e05d7e3ed48b0783 Mon Sep 17 00:00:00 2001
From: Yuri S <yuri@blazemeter.com>
Date: Fri, 22 Dec 2017 03:22:50 +0200
Subject: [PATCH 3/6] Fixed console error

---
 examples/src/components/GithubUsers.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/src/components/GithubUsers.js b/examples/src/components/GithubUsers.js
index f3a0887d40..00795927f9 100644
--- a/examples/src/components/GithubUsers.js
+++ b/examples/src/components/GithubUsers.js
@@ -13,7 +13,8 @@ const GithubUsers = createClass({
 	getInitialState () {
 		return {
 			backspaceRemoves: true,
-			multi: true
+			multi: true,
+			creatable: false,
 		};
 	},
 	onChange (value) {

From 3a4fe2655719c855e5c10bbd94e9bb46c824df6a Mon Sep 17 00:00:00 2001
From: Yuri S <yuri@blazemeter.com>
Date: Fri, 22 Dec 2017 06:53:52 +0200
Subject: [PATCH 4/6] Fixed readme example

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a022326a9a..e645a74891 100644
--- a/README.md
+++ b/README.md
@@ -66,10 +66,13 @@ class App extends React.Component {
     console.log(`Selected: ${selectedOption.label}`);
   }
   render() {
+  	const { selectedOption } = this.state;
+  	const value = selectedOption && selectedOption.value;
+  	
     return (
       <Select
         name="form-field-name"
-        value={this.state.selectedOption.value}
+        value={value}
         onChange={this.handleChange}
         options={[
           { value: 'one', label: 'One' },

From 9ae8edd7d92f2514ad0a53523704c665e46b4636 Mon Sep 17 00:00:00 2001
From: Yuri S <yuri@blazemeter.com>
Date: Sun, 24 Dec 2017 00:09:46 +0200
Subject: [PATCH 5/6] Added missing tests for Option.js and refactored
 Option-test.js.

---
 test/Option-test.js | 163 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 125 insertions(+), 38 deletions(-)

diff --git a/test/Option-test.js b/test/Option-test.js
index e2c85b3713..9fa91468ed 100644
--- a/test/Option-test.js
+++ b/test/Option-test.js
@@ -1,29 +1,25 @@
-'use strict';
 /* global describe, it, beforeEach */
 
-var helper = require('../testHelpers/jsdomHelper');
-helper();
+import helper from '../testHelpers/jsdomHelper';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import sinon from 'sinon';
+import TestUtils from 'react-dom/test-utils';
+import unexpected from 'unexpected';
+import unexpectedDom from 'unexpected-dom';
+import unexpectedSinon from 'unexpected-sinon';
 
-var unexpected = require('unexpected');
-var unexpectedDom = require('unexpected-dom');
-var unexpectedSinon = require('unexpected-sinon');
-var sinon = require('sinon');
+import Option from '../src/Option';
 
-var expect = unexpected
+helper();
+const expect = unexpected
 	.clone()
 	.installPlugin(unexpectedSinon)
 	.installPlugin(unexpectedDom);
 
-var React = require('react');
-var ReactDOM = require('react-dom');
-var TestUtils = require('react-dom/test-utils');
-
-var Option = require('../src/Option').default;
-
-
-describe('Option component', function() {
-	var onFocus, onSelect, onUnfocus, instance;
-	var createOption = (props) => {
+describe('Option component', () => {
+	let onFocus, onSelect, onUnfocus, instance, node;
+	const createOption = props => {
 		onFocus = sinon.spy();
 		onSelect = sinon.spy();
 		onUnfocus = sinon.spy();
@@ -36,12 +32,12 @@ describe('Option component', function() {
 				{...props}
 				/>
 		);
-		return instance;
 
+		return instance;
 	};
 
-	it('renders the given option', function() {
-		var props = {
+	beforeEach(() => {
+		const props = {
 			instancePrefix: 'test',
 			className: 'Wrapper-Class',
 			children: 'Test Label',
@@ -52,7 +48,10 @@ describe('Option component', function() {
 			}
 		};
 		instance = createOption(props);
-		var node = ReactDOM.findDOMNode(instance);
+		node = ReactDOM.findDOMNode(instance);
+	});
+
+	it('renders the given option', () => {
 		expect(node.textContent, 'to equal', 'Test Label');
 		expect(onSelect, 'was not called');
 		TestUtils.Simulate.mouseDown(node);
@@ -63,8 +62,9 @@ describe('Option component', function() {
 		TestUtils.Simulate.mouseMove(node);
 		expect(onFocus, 'was called');
 	});
-	it('does not focus if Option isFocused already', function() {
-		var props = {
+
+	it('does not focus if Option isFocused already', () => {
+		const props = {
 			isFocused: true,
 			instancePrefix: 'test',
 			className: 'Wrapper-Class',
@@ -76,24 +76,13 @@ describe('Option component', function() {
 			}
 		};
 		instance = createOption(props);
-		var node = ReactDOM.findDOMNode(instance);
+		node = ReactDOM.findDOMNode(instance);
 		expect(onFocus, 'was not called');
 		TestUtils.Simulate.mouseEnter(node);
 		expect(onFocus, 'was not called');
 	});
-	it('simulates touch events', function() {
-		var props = {
-			instancePrefix: 'test',
-			className: 'Wrapper-Class',
-			children: 'Test Label',
-			option: {
-				title: 'testitem',
-				label: 'testitem',
-				className: 'Option-Class'
-			}
-		};
-		instance = createOption(props);
-		var node = ReactDOM.findDOMNode(instance);
+
+	it('simulates touch events', () => {
 		expect(instance.dragging, 'to equal', undefined);
 		// simulate scrolling event
 		TestUtils.Simulate.touchStart(node);
@@ -110,4 +99,102 @@ describe('Option component', function() {
 		expect(onSelect, 'was called');
 		expect(instance.dragging, 'to equal', false);
 	});
+
+	describe('blockEvent', () => {
+		let preventDefault, stopPropagation, openStub;
+		beforeEach(() =>{
+			preventDefault = sinon.spy();
+			stopPropagation = sinon.spy();
+			openStub = sinon.stub(window, 'open');
+		});
+
+		afterEach(() => {
+			openStub.restore();
+		});
+
+		it('should call window.open', () => {
+			const event = {
+				target: {
+					href: 'http://go.com',
+					tagName: 'A',
+					target: 'yes',
+				},
+				preventDefault,
+				stopPropagation,
+			};
+
+			instance.blockEvent(event);
+
+			expect(openStub, 'was called once');
+			expect(openStub, 'was called with', event.target.href, event.target.target);
+		});
+
+		it('should set window.location.href and not call window.open', () => {
+			const event = {
+				target: {
+					href: 'http://go.com',
+					tagName: 'A',
+				},
+				preventDefault,
+				stopPropagation,
+			};
+
+			Object.defineProperty(window.location, 'href', {
+				writable: true,
+				value: 'url'
+			});
+
+			expect(window.location.href, 'not to equal', event.target.href);
+
+			instance.blockEvent(event);
+
+			expect(window.location.href, 'to equal', event.target.href);
+			expect(openStub, 'was not called');
+		});
+
+		it('should return and not call window.open when tagName !=A', () => {
+			const event = {
+				target: {
+					href: 'http://go.com',
+					tagName: '',
+				},
+				preventDefault,
+				stopPropagation,
+			};
+
+			Object.defineProperty(window.location, 'href', {
+				writable: true,
+				value: 'url'
+			});
+
+			expect(window.location.href, 'to equal', 'url');
+
+			instance.blockEvent(event);
+
+			expect(window.location.href, 'to equal', 'url');
+			expect(openStub, 'was not called');
+		});
+
+		it('should return and not call window.open when no href', () => {
+			const event = {
+				target: {
+					tagName: 'A',
+				},
+				preventDefault,
+				stopPropagation,
+			};
+
+			Object.defineProperty(window.location, 'href', {
+				writable: true,
+				value: 'url'
+			});
+
+			expect(window.location.href, 'to equal', 'url');
+
+			instance.blockEvent(event);
+
+			expect(window.location.href, 'to equal', 'url');
+			expect(openStub, 'was not called');
+		});
+	});
 });

From 0213219b288367cbf0297204825ef25141533e4c Mon Sep 17 00:00:00 2001
From: Yuri S <yuri@blazemeter.com>
Date: Sun, 24 Dec 2017 00:38:11 +0200
Subject: [PATCH 6/6] Added missing tests for Async.js

---
 test/Async-test.js | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/test/Async-test.js b/test/Async-test.js
index f76bb19801..d8b2607aeb 100644
--- a/test/Async-test.js
+++ b/test/Async-test.js
@@ -1,4 +1,5 @@
 'use strict';
+/* global describe, it, beforeEach */
 /* eslint react/jsx-boolean-value: 0 */
 
 // Emulating the DOM here, only so that if this test file gets
@@ -502,8 +503,7 @@ describe('Async', () => {
 
 	describe('props sync test', () => {
 		it('should update options on componentWillReceiveProps', () => {
-			createControl({
-			});
+			createControl({});
 			asyncInstance.componentWillReceiveProps({
 				options: [{
 					label: 'bar',
@@ -513,5 +513,27 @@ describe('Async', () => {
 			expect(asyncNode.querySelectorAll('[role=option]').length, 'to equal', 1);
 			expect(asyncNode.querySelector('[role=option]').textContent, 'to equal', 'bar');
 		});
+
+		it('should not update options on componentWillReceiveProps', () => {
+			const props = {options: []};
+			createControl(props);
+
+			const setStateStub = sinon.stub(asyncInstance, 'setState');
+			asyncInstance.componentWillReceiveProps(props);
+
+			expect(setStateStub, 'was not called');
+
+			setStateStub.restore();
+		});
+	});
+
+	describe('componentWillUnmount', () => {
+		it('should set _callback to null', () => {
+			createControl({});
+			expect(asyncInstance._callback, 'not to equal', null);
+
+			asyncInstance.componentWillUnmount();
+			expect(asyncInstance._callback, 'to equal', null);
+		});
 	});
 });