chore: npm testing script

alibaba · Sep 1, 2016 · cc71812 · cc71812
1 parent 4144bee
commit cc71812
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/lib/requestHandler.js b/lib/requestHandler.js
@@ -233,13 +233,8 @@ function userRequestHandler(req,userRes){
                         resourceInfo.resHeader  = resHeader;
                         resourceInfo.resBody    = serverResData;
                         resourceInfo.length     = serverResData ? serverResData.length : 0;
-<<<<<<< HEAD
 
-                        GLOBAL.recorder && GLOBAL.recorder.updateRecord(resourceInfoId,resourceInfo);
-=======
-
                         global.recorder && global.recorder.updateRecord(resourceInfoId,resourceInfo);
->>>>>>> 6521604... change: discard decrpecated GLOBAL
 
                         callback();
 
@@ -378,13 +373,8 @@ function connectReqHandler(req, socket, head){
             resourceInfo.resHeader  = {};
             resourceInfo.resBody    = "";
             resourceInfo.length     = 0;
-<<<<<<< HEAD
 
-            GLOBAL.recorder && GLOBAL.recorder.updateRecord(resourceInfoId,resourceInfo);
-=======
-
             global.recorder && global.recorder.updateRecord(resourceInfoId,resourceInfo);
->>>>>>> 6521604... change: discard decrpecated GLOBAL
 
             callback();
         }

diff --git a/package.json b/package.json
@@ -48,7 +48,6 @@
     "test": "sh test/test.sh",
     "testserver": "node test/server/startServer.js"
   },
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "https://github.com/alibaba/anyproxy"