Update tests and PropTypes

app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx

@@ -299,17 +299,10 @@ BlockSettingsView.propTypes = {
 		setBlockSetupSeen: PropTypes.func.isRequired,
 	}).isRequired,
 	setupLifecycle: PropTypes.shape({
-		blockingPolicy: PropTypes.string.isRequired,
-		enable_anti_tracking: PropTypes.bool.isRequired,
-		enable_ad_block: PropTypes.bool.isRequired,
-		enable_smart_block: PropTypes.bool.isRequired,
 		blockSetupSeen: PropTypes.bool.isRequired,
-		searchSetupSeen: PropTypes.bool.isRequired,
-	}).isRequired,
-	antiSuite: PropTypes.shape({
-		enable_ad_block: PropTypes.bool.isRequired,
-		enable_anti_tracking: PropTypes.bool.isRequired,
-		enable_smart_block: PropTypes.bool.isRequired,
 	}).isRequired,
+	enable_ad_block: PropTypes.bool.isRequired,
+	enable_anti_tracking: PropTypes.bool.isRequired,
+	enable_smart_block: PropTypes.bool.isRequired,
 	blockingPolicy: PropTypes.string.isRequired
 };

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

@@ -22,7 +22,13 @@ jest.mock('../../../../../shared-components/Tooltip');
 
 describe('app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.test.jsx', () => {
 	const initialState = {
-		setupLifecycle: noop,
+		setupLifecycle: {
+			blockSetupSeen: false
+		},
+		blockingPolicy: '',
+		enable_ad_block: false,
+		enable_anti_tracking: false,
+		enable_smart_block: false,
 		actions: {
 			logout: noop,
 			setAntiTracking: noop,

app/shared-hub/reducers/__tests__/AntiSuiteReducer.test.js

@@ -16,11 +16,9 @@ import AntiSuiteReducer from '../AntiSuiteReducer';
 import { SET_AD_BLOCK, SET_ANTI_TRACKING, SET_SMART_BLOCK } from '../../constants/AntiSuiteConstants';
 
 const initialState = Immutable({
-	antiSuite: {
-		enable_ad_block: false,
-		enable_anti_tracking: false,
-		enable_smart_block: false
-	}
+	enable_ad_block: false,
+	enable_anti_tracking: false,
+	enable_smart_block: false
 });
 
 describe('app/shared-hub/reducers/AntiSuiteReducer', () => {
@@ -34,10 +32,10 @@ describe('app/shared-hub/reducers/AntiSuiteReducer', () => {
 		};
 		const action = { data, type: SET_AD_BLOCK };
 
-		const updatedAntiSuiteState = Immutable.merge(initialState.antiSuite, data);
+		const updatedAntiSuiteState = Immutable.merge(initialState, data);
 
 		expect(AntiSuiteReducer(initialState, action)).toEqual({
-			antiSuite: updatedAntiSuiteState
+			...updatedAntiSuiteState
 		});
 	});
 
@@ -47,10 +45,10 @@ describe('app/shared-hub/reducers/AntiSuiteReducer', () => {
 		};
 		const action = { data, type: SET_ANTI_TRACKING };
 
-		const updatedAntiSuiteState = Immutable.merge(initialState.antiSuite, data);
+		const updatedAntiSuiteState = Immutable.merge(initialState, data);
 
 		expect(AntiSuiteReducer(initialState, action)).toEqual({
-			antiSuite: updatedAntiSuiteState
+			...updatedAntiSuiteState
 		});
 	});
 
@@ -60,10 +58,10 @@ describe('app/shared-hub/reducers/AntiSuiteReducer', () => {
 		};
 		const action = { data, type: SET_SMART_BLOCK };
 
-		const updatedAntiSuiteState = Immutable.merge(initialState.antiSuite, data);
+		const updatedAntiSuiteState = Immutable.merge(initialState, data);
 
 		expect(AntiSuiteReducer(initialState, action)).toEqual({
-			antiSuite: updatedAntiSuiteState
+			...updatedAntiSuiteState
 		});
 	});
 });