rename handlers

FormidableLabs · Jul 7, 2016 · 60481ae · 60481ae
1 parent 43c54f6
commit 60481ae
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/src/error-handler.js b/src/error-handler.js
@@ -2,13 +2,13 @@ import logger from "./logger";
 
 
 const errorHandler = {
-  defaultError(err) {
+  onError(err) {
     logger.enable();
     logger.error(`${err.stack || err.toString()}\n`);
   },
 
   dryRunnerError(err) {
-    errorHandler.defaultError(err);
+    errorHandler.onError(err);
 
     logger.info([
       "Something unexpected happened during 'dry-run'.",
@@ -17,15 +17,15 @@ const errorHandler = {
   },
 
   postpublishError(err) {
-    errorHandler.postScriptError(err, "postpublish");
+    errorHandler.scriptError(err, "postpublish");
   },
 
   postversionError(err) {
-    errorHandler.postScriptError(err, "postversion");
+    errorHandler.scriptError(err, "postversion");
   },
 
-  postScriptError(err, script) {
-    errorHandler.defaultError(err);
+  scriptError(err, script) {
+    errorHandler.onError(err);
 
     logger.info([
       `Something unexpected happened during '${script}'.`,

diff --git a/test/spec/error-handler.spec.js b/test/spec/error-handler.spec.js
@@ -17,11 +17,11 @@ describe("errorHandler", () => {
     sandbox.restore();
   });
 
-  describe("defaultError", () => {
+  describe("onError", () => {
     it("should handle an error with a stack", () => {
       const err = {stack: "mock stack"};
 
-      errorHandler.defaultError(err);
+      errorHandler.onError(err);
       expect(logger.error)
         .to.have.callCount(1).and
         .to.have.been.calledWith("mock stack\n");
@@ -32,7 +32,7 @@ describe("errorHandler", () => {
 
       sandbox.stub(err, "toString", () => "mock error");
 
-      errorHandler.defaultError(err);
+      errorHandler.onError(err);
       expect(logger.enable).to.have.callCount(1);
       expect(logger.error)
         .to.have.callCount(1).and
@@ -43,10 +43,10 @@ describe("errorHandler", () => {
 
   describe("dryRunnerError", () => {
     it("should handle a dry-run error", () => {
-      sandbox.stub(errorHandler, "defaultError");
+      sandbox.stub(errorHandler, "onError");
 
       errorHandler.dryRunnerError("mock error");
-      expect(errorHandler.defaultError)
+      expect(errorHandler.onError)
         .to.have.callCount(1).and
         .to.have.been.calledWith("mock error");
       expect(logger.info).to.have.callCount(1);
@@ -55,32 +55,32 @@ describe("errorHandler", () => {
 
   describe("postpublishError", () => {
     it("should handle a postpublish error", () => {
-      sandbox.stub(errorHandler, "postScriptError");
+      sandbox.stub(errorHandler, "scriptError");
 
       errorHandler.postpublishError("mock error");
-      expect(errorHandler.postScriptError)
+      expect(errorHandler.scriptError)
         .to.have.callCount(1).and
         .to.have.been.calledWith("mock error", "postpublish");
     });
   });
 
   describe("postversionError", () => {
     it("should handle a postversion error", () => {
-      sandbox.stub(errorHandler, "postScriptError");
+      sandbox.stub(errorHandler, "scriptError");
 
       errorHandler.postversionError("mock error");
-      expect(errorHandler.postScriptError)
+      expect(errorHandler.scriptError)
         .to.have.callCount(1).and
         .to.have.been.calledWith("mock error", "postversion");
     });
   });
 
-  describe("postScriptError", () => {
-    it("should handle a post script error", () => {
-      sandbox.stub(errorHandler, "defaultError");
+  describe("scriptError", () => {
+    it("should handle a script error", () => {
+      sandbox.stub(errorHandler, "onError");
 
-      errorHandler.postScriptError("mock error");
-      expect(errorHandler.defaultError)
+      errorHandler.scriptError("mock error");
+      expect(errorHandler.onError)
         .to.have.callCount(1).and
         .to.have.been.calledWith("mock error");
       expect(logger.info).to.have.callCount(1);