From 86e6ab71c4f7ddb78234174f806b759e25c75055 Mon Sep 17 00:00:00 2001
From: evilebottnawi <sheo13666q@gmail.com>
Date: Sat, 10 Oct 2020 20:03:50 +0300
Subject: [PATCH] fix: merge problems

---
 bin/utils/validate-options.js                 | 21 -------------------
 .../errors/v5-schema-validation/options.js    |  3 ---
 .../v5-schema-validation/validation.test.js   | 17 ---------------
 3 files changed, 41 deletions(-)
 delete mode 100644 bin/utils/validate-options.js
 delete mode 100644 test/binCases/errors/v5-schema-validation/options.js
 delete mode 100644 test/binCases/errors/v5-schema-validation/validation.test.js

diff --git a/bin/utils/validate-options.js b/bin/utils/validate-options.js
deleted file mode 100644
index 4452e54650e..00000000000
--- a/bin/utils/validate-options.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const webpackConfigurationSchema = require("../config/webpackConfigurationSchema.json");
-const validateSchema = require("webpack").validateSchema;
-
-module.exports = function validateOptions(options) {
-	let error;
-	try {
-		const errors = validateSchema(webpackConfigurationSchema, options);
-		if (errors && errors.length > 0) {
-			const { WebpackOptionsValidationError } = require("webpack");
-			error = new WebpackOptionsValidationError(errors);
-		}
-	} catch (err) {
-		error = err;
-	}
-
-	if (error) {
-		console.error(error.message);
-		// eslint-disable-next-line no-process-exit
-		process.exit(-1);
-	}
-};
diff --git a/test/binCases/errors/v5-schema-validation/options.js b/test/binCases/errors/v5-schema-validation/options.js
deleted file mode 100644
index 01afdf9a640..00000000000
--- a/test/binCases/errors/v5-schema-validation/options.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-	entry: "hey"
-};
diff --git a/test/binCases/errors/v5-schema-validation/validation.test.js b/test/binCases/errors/v5-schema-validation/validation.test.js
deleted file mode 100644
index bd18d9020f4..00000000000
--- a/test/binCases/errors/v5-schema-validation/validation.test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-"use strict";
-
-const validation = require("../../../../bin/utils/validate-options");
-const { run } = require("../../../testUtils");
-
-test("validation", () => {
-	const mockExit = jest.spyOn(process, "exit").mockImplementation(() => {});
-	validation(null);
-	expect(mockExit).toHaveBeenCalledWith(-1);
-	mockExit.mockRestore();
-});
-
-test("validation-success", () => {
-	const { stdout, code } = run(__dirname, ["--config", "./options.js"]);
-	expect(stdout).toContain("Can't resolve 'hey'");
-	expect(code).toBe(2);
-});