Cleanup unit tests, move withRouter back to component entry path, fix…

… AntiSuiteReducer tests, and mock nested functions in action tests

app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountForm/__tests__/Step1_CreateAccountForm.test.jsx

@@ -25,27 +25,27 @@ jest.mock('../../../../../shared-components/ToggleCheckbox', () => {
 
 const noop = () => {};
 describe('app/hub/Views/Step1_CreateAccountForm component', () => {
+	const initialState = {
+		email: 'test@example.com',
+		emailError: false,
+		confirmEmail: 'test@example.com',
+		confirmEmailError: false,
+		firstName: 'First',
+		lastName: 'Last',
+		isUpdatesChecked: true,
+		legalConsentChecked: true,
+		password: '',
+		confirmPassword: '',
+		passwordInvalidError: false,
+		passwordLengthError: false,
+		handleInputChange: noop,
+		handleUpdatesCheckboxChange: noop,
+		handleLegalConsentCheckboxChange: noop,
+		handleSubmit: jest.fn(),
+	};
+
 	describe('Snapshot tests with react-test-renderer', () => {
 		test('create account view is rendered correctly', () => {
-			const initialState = {
-				email: 'test@example.com',
-				emailError: false,
-				confirmEmail: 'test@example.com',
-				confirmEmailError: false,
-				firstName: 'First',
-				lastName: 'Last',
-				isUpdatesChecked: true,
-				legalConsentChecked: true,
-				password: '',
-				confirmPassword: '',
-				passwordInvalidError: false,
-				passwordLengthError: false,
-				handleInputChange: noop,
-				handleUpdatesCheckboxChange: noop,
-				handleLegalConsentCheckboxChange: noop,
-				handleSubmit: jest.fn(),
-			};
-
 			const component = renderer.create(
 				<MemoryRouter>
 					<Step1_CreateAccountForm {...initialState} />
@@ -57,56 +57,28 @@ describe('app/hub/Views/Step1_CreateAccountForm component', () => {
 
 	describe('Shallow snapshot tests rendered with Enzyme', () => {
 		test('the happy path of the component', () => {
-			const initialState = {
-				email: 'test@example.com',
-				emailError: false,
-				confirmEmail: 'test@example.com',
-				confirmEmailError: false,
-				firstName: 'First',
-				lastName: 'Last',
-				isUpdatesChecked: true,
-				legalConsentChecked: true,
-				password: '',
-				confirmPassword: '',
-				passwordInvalidError: false,
-				passwordLengthError: false,
-				handleInputChange: noop,
-				handleUpdatesCheckboxChange: noop,
-				handleLegalConsentCheckboxChange: noop,
-				handleSubmit: jest.fn(),
-			};
-
 			const component = shallow(<Step1_CreateAccountForm {...initialState} />);
 
-			expect(component.find('.Step1_CreateAccountForm__inputBox').length).toBe(6);
-			expect(component.find('.Step1_CreateAccountForm__ctaButton').length).toBe(1);
-
 			expect(initialState.handleSubmit.mock.calls.length).toBe(0);
 			component.find('form').simulate('submit');
 			expect(initialState.handleSubmit.mock.calls.length).toBe(1);
 		});
 
 		test('the sad path of the component with errors', () => {
-			const initialState = {
-				email: 'test@example.com',
+			const initialStateFail = {
+				...initialState,
 				emailError: true,
 				confirmEmail: 'badConfirmEmail@example.com',
 				confirmEmailError: true,
-				firstName: 'First',
-				lastName: 'Last',
 				isUpdatesChecked: false,
 				legalConsentChecked: false,
 				password: 'password',
-				confirmPassword: 'badPassword',
+				confirmPassword: 'password',
 				passwordInvalidError: true,
 				passwordLengthError: true,
-				handleInputChange: noop,
-				handleUpdatesCheckboxChange: noop,
-				handleLegalConsentCheckboxChange: noop,
-				handleSubmit: jest.fn(),
-			};
+			}
 
-			const component = shallow(<Step1_CreateAccountForm {...initialState} />);
+			const component = shallow(<Step1_CreateAccountForm {...initialStateFail} />);
 			component.find('form').simulate('submit');
 			expect(component.find('.Step1_CreateAccountForm__inputErrorContainer').length).toBe(4);
 			expect(component).toMatchSnapshot();

app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/__tests__/Step1_CreateAccountView.test.jsx

@@ -29,15 +29,14 @@ jest.mock('../../Step1_LogInForm', () => {
 
 const noop = () => {};
 describe('app/hub/Views/Step1_CreateAccountView component', () => {
+	const initialState = {
+		user: null,
+		actions: {
+			setSetupStep: noop
+		}
+	};
 	describe('Snapshot tests with react-test-renderer', () => {
 		test('Create Account Form view is rendered correctly', () => {
-			const initialState = {
-				user: null,
-				actions: {
-					setSetupStep: noop
-				}
-			};
-
 			const component = renderer.create(
 				<MemoryRouter>
 					<Step1_CreateAccountView {...initialState} />
@@ -49,17 +48,14 @@ describe('app/hub/Views/Step1_CreateAccountView component', () => {
 
 	describe('Shallow snapshot tests rendered with Enzyme', () => {
 		test('Create Account Form view is rendered correctly when user is logged in', () => {
-			const initialState = {
+			const plusUserState = {
+				...initialState,
 				user: {
 					plusAccess: true
-				},
-				actions: {
-					setSetupStep: noop
 				}
 			};
 
 			const component = shallow(<Step1_CreateAccountView {...initialState} />);
-			expect(component.find('.Step1_CreateAccountView__alreadySignedIn').length).toBe(1);
 		});
 	});
 });

app/ghostery-browser-hub/Views/OnboardingViews/Step1_LogInForm/__tests__/Step1_LoginForm.test.jsx

@@ -19,17 +19,17 @@ import Step1_LoginForm from '../Step1_LoginForm';
 
 const noop = () => {};
 describe('app/hub/Views/Step1_LoginForm component', () => {
+	const initialState = {
+		email: '',
+		password: '',
+		emailError: false,
+		passwordError: false,
+		handleSubmit: noop,
+		handleInputChange: noop,
+		handleForgotPassword: noop
+	};
 	describe('Snapshot tests with react-test-renderer', () => {
 		test('Login Form view is rendered correctly', () => {
-			const initialState = {
-				email: '',
-				password: '',
-				emailError: false,
-				passwordError: false,
-				handleSubmit: noop,
-				handleInputChange: noop,
-				handleForgotPassword: noop
-			};
 
 			const component = renderer.create(
 				<MemoryRouter>
@@ -42,45 +42,34 @@ describe('app/hub/Views/Step1_LoginForm component', () => {
 
 	describe('Shallow snapshot tests rendered with Enzyme', () => {
 		test('the happy path of the component', () => {
-			const initialState = {
+			const happyState = {
+				...initialState,
 				email: 'test@example.com',
 				password: 'examplePassword',
-				emailError: false,
-				passwordError: false,
 				handleSubmit: jest.fn(),
-				handleInputChange: () => {},
-				handleForgotPassword: noop
-			};
+			}
 
-			const component = shallow(<Step1_LoginForm {...initialState} />);
-			expect(component.find('.Step1_LogInForm').length).toBe(1);
-			expect(component.find('.Step1_LogInForm__inputBox').length).toBe(2);
-			expect(component.find('.Step1_LogInForm__forgotPassword').length).toBe(1);
-			expect(component.find('.Step1_LogInForm__ctaButton').length).toBe(1);
-
-			expect(initialState.handleSubmit.mock.calls.length).toBe(0);
+			const component = shallow(<Step1_LoginForm {...happyState} />);
+			expect(happyState.handleSubmit.mock.calls.length).toBe(0);
 			component.find('form').simulate('submit');
-			expect(initialState.handleSubmit.mock.calls.length).toBe(1);
+			expect(happyState.handleSubmit.mock.calls.length).toBe(1);
 		});
 
 		test('the sad path of the component with errors', () => {
-			const initialState = {
+			const sadState = {
+				...initialState,
 				email: 'test@example.com',
 				password: 'examplePassword',
 				emailError: true,
 				passwordError: true,
 				handleSubmit: jest.fn(),
-				handleInputChange: () => {},
-				handleForgotPassword: noop
 			};
 
-			const component = shallow(<Step1_LoginForm {...initialState} />);
+			const component = shallow(<Step1_LoginForm {...sadState} />);
 
-			expect(initialState.handleSubmit.mock.calls.length).toBe(0);
+			expect(sadState.handleSubmit.mock.calls.length).toBe(0);
 			component.find('form').simulate('submit');
-			expect(initialState.handleSubmit.mock.calls.length).toBe(1);
-			expect(component.find('.Step1_LogInForm__inputError').length).toBe(2);
-
+			expect(sadState.handleSubmit.mock.calls.length).toBe(1);
 		})
 	});
 });

app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/__tests__/BlockSettingsView.test.jsx

@@ -21,19 +21,19 @@ const noop = () => {};
 jest.mock('../../../../../shared-components/Tooltip');
 
 describe('app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.test.jsx', () => {
+	const initialState = {
+		actions: {
+			logout: noop,
+			setAntiTracking: noop,
+			setAdBlock: noop,
+			setSmartBlocking: noop,
+			setBlockingPolicy: noop,
+			setToast: noop,
+			setSetupStep: noop,
+		}
+	};
 	describe('Snapshot tests with react-test-renderer', () => {
 		test('BlockSettings View is rendered correctly', () => {
-			const initialState = {
-				actions: {
-					logout: noop,
-					setAntiTracking: noop,
-					setAdBlock: noop,
-					setSmartBlocking: noop,
-					setBlockingPolicy: noop,
-					setToast: noop,
-					setSetupStep: noop,
-				}
-			};
 			const component = renderer.create(
 				<MemoryRouter>
 					<BlockSettingsView  {...initialState} />
@@ -45,7 +45,8 @@ describe('app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView
 
 	describe('Shallow snapshot tests rendered with Enzyme', () => {
 		test('BlockSettings View happy path', () => {
-			const initialState = {
+			const happyState = {
+				...initialState,
 				actions: {
 					logout: noop,
 					setAntiTracking: jest.fn(),
@@ -59,9 +60,7 @@ describe('app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView
 					push: noop
 				}
 			};
-			const component = shallow(<BlockSettingsView {...initialState} />);
-			expect(component.find('.BlockSettingsView_checkbox').length).toBe(1);
-			expect(component.find('.BlockSettingsView__radioButtonContainer').length).toBe(9);
+			const component = shallow(<BlockSettingsView {...happyState } />);
 
 			const instance = component.instance();
 
@@ -75,11 +74,11 @@ describe('app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView
 			expect(component.state('blockAds')).toBe(false);
 
 			instance.handleSubmit();
-			expect(initialState.actions.setAntiTracking.mock.calls.length).toBe(1);
-			expect(initialState.actions.setAdBlock.mock.calls.length).toBe(1);
-			expect(initialState.actions.setSmartBlocking.mock.calls.length).toBe(1);
-			expect(initialState.actions.setBlockingPolicy.mock.calls.length).toBe(1);
-			expect(initialState.actions.setSetupStep.mock.calls.length).toBe(1);
+			expect(happyState.actions.setAntiTracking.mock.calls.length).toBe(1);
+			expect(happyState.actions.setAdBlock.mock.calls.length).toBe(1);
+			expect(happyState.actions.setSmartBlocking.mock.calls.length).toBe(1);
+			expect(happyState.actions.setBlockingPolicy.mock.calls.length).toBe(1);
+			expect(happyState.actions.setSetupStep.mock.calls.length).toBe(1);
 
 			expect(component).toMatchSnapshot();
 		});