Merge pull request #142 from thiagobustamante/master

Remove test dependency with httpbin.org, running httpbin in a docker …
TreeGateway · May 27, 2018 · 2cf7cb0 · 2cf7cb0
2 parents 9ba549c + 620292d
commit 2cf7cb0
Show file tree

Hide file tree

Showing 29 changed files with 39 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ services:
 - docker
 before_install:
 - docker run -p 6379:6379 -d --name tree_redis redis:3.0.7-alpine
+- docker run -p 80:80 -d --name httpbin kennethreitz/httpbin
 - docker run -p 8500:8500 -d --name tree_consul consul
 script: nyc npm run test && nyc report --reporter=text-lcov | coveralls
 deploy:

diff --git a/src/config/errors.ts b/src/config/errors.ts
@@ -29,7 +29,7 @@ export class ValidationError extends Errors.ForbidenError {
             } else if (_.endsWith(e.type, 'Unknown')) {
                 unexpectedFields.push(e.path);
             } else {
-                invalidFields.push(e.path);
+                invalidFields.push(`${e.path} (${e.context?e.context.value:''})`);
             }
         });
 

diff --git a/src/pipeline/group.ts b/src/pipeline/group.ts
@@ -75,7 +75,6 @@ export function buildGroupAllowTest(request: string, groups: Array<Group>, group
                                             .map(p => `'${p}'`)
                                             .join(',');
                         func.push(`(mm.all(${request}.path, [${expressions}]))`);
-                        console.info(expressions);
                     } else {
                         func.push(`(mm.isMatch(${request}.path, '${normalizePath(path)}'))`);
                     }

diff --git a/test/data/apis/authenticated.json b/test/data/apis/authenticated.json
@@ -4,7 +4,7 @@
     "path": "secure/",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": "fifteen seconds"
     },

diff --git a/test/data/apis/basicAuthentication.json b/test/data/apis/basicAuthentication.json
@@ -4,7 +4,7 @@
     "path": "secureBasic/",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/basicAuthenticationByGroup.json b/test/data/apis/basicAuthenticationByGroup.json
@@ -17,7 +17,7 @@
     ],
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/basicAuthenticationByGroupMultiPath.json b/test/data/apis/basicAuthenticationByGroupMultiPath.json
@@ -17,7 +17,7 @@
     ],
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/cached.json b/test/data/apis/cached.json
@@ -16,7 +16,7 @@
     ],
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/circuitbreaker.json b/test/data/apis/circuitbreaker.json
@@ -4,7 +4,7 @@
     "path": "circuitbreaker/",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         }
     },
     "circuitBreaker": [{

diff --git a/test/data/apis/circuitbreakerTimewindow.json b/test/data/apis/circuitbreakerTimewindow.json
@@ -4,7 +4,7 @@
     "path": "circuitbreakerTime/",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         }
     },
     "circuitBreaker": [{

diff --git a/test/data/apis/cors-middleware.json b/test/data/apis/cors-middleware.json
@@ -4,7 +4,7 @@
     "path": "cors-middleware/",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         }
     },
     "cors" : [{

diff --git a/test/data/apis/cors.json b/test/data/apis/cors.json
@@ -4,7 +4,7 @@
     "path": "cors/",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         }
     },
     "cors" : [{

diff --git a/test/data/apis/customAuthentication.json b/test/data/apis/customAuthentication.json
@@ -4,7 +4,7 @@
     "path": "secureCustom/",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/filtered.json b/test/data/apis/filtered.json
@@ -28,7 +28,7 @@
     ],
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/headerSplit.yml b/test/data/apis/headerSplit.yml
@@ -9,10 +9,10 @@ proxy:
         name: header
         options:
           name: authorization
-          defaultTarget: http://httpbin.org
+          defaultTarget: http://localhost
           destinations: 
-            - target: http://httpbin.org
+            - target: http://localhost
               value: '1'
-            - target: http://httpbin.org/anything
+            - target: http://localhost/anything
               value: '2'
   timeout: 5000
diff --git a/test/data/apis/httpbin.json b/test/data/apis/httpbin.json
@@ -32,7 +32,7 @@
     ],
     "proxy": {
         "target": {
-            "host": "http://httpbin.org",
+            "host": "http://localhost",
             "allow": ["Group1"],
             "deny": "Group2"
         },

diff --git a/test/data/apis/intercepted.json b/test/data/apis/intercepted.json
@@ -19,7 +19,7 @@
     ],
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/interceptedByDefaultMiddleware.yml b/test/data/apis/interceptedByDefaultMiddleware.yml
@@ -14,7 +14,7 @@ group:
 parseReqBody: true
 proxy:
   target:
-    host: http://httpbin.org
+    host: http://localhost
   timeout: 5000
 interceptor:
   response:

diff --git a/test/data/apis/limitedApi.json b/test/data/apis/limitedApi.json
@@ -4,7 +4,7 @@
     "path": "limited",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/limitedApiByGroup.json b/test/data/apis/limitedApiByGroup.json
@@ -16,7 +16,7 @@
     ],
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/loadBalancer.yml b/test/data/apis/loadBalancer.yml
@@ -9,12 +9,12 @@ proxy:
         name: loadBalancer
         options:
           destinations: 
-            - target: http://httpbin.org
+            - target: http://localhost
               weight: 75
-              healthCheck: http://httpbin.org/get
-            - target: http://httpbin.org/anything
+              healthCheck: http://localhost/get
+            - target: http://localhost/anything
               weight: 25
-              healthCheck: http://httpbin.org/anything/get
+              healthCheck: http://localhost/anything/get
           database:
             checkInterval: 5 minutes
           strategy: weight

diff --git a/test/data/apis/localAuthentication.json b/test/data/apis/localAuthentication.json
@@ -4,7 +4,7 @@
     "path": "secureLocal/",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/postApi.json b/test/data/apis/postApi.json
@@ -5,7 +5,7 @@
     "parseReqBody": true,
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/postApiRemoveHeader.json b/test/data/apis/postApiRemoveHeader.json
@@ -5,7 +5,7 @@
     "parseReqBody": true,
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "supressViaHeader": true,
         "timeout": 5000

diff --git a/test/data/apis/querySplit.yml b/test/data/apis/querySplit.yml
@@ -9,10 +9,10 @@ proxy:
         name: query
         options:
           param: apiVersion
-          defaultTarget: http://httpbin.org
+          defaultTarget: http://localhost
           destinations: 
-            - target: http://httpbin.org
+            - target: http://localhost
               value: '1'
-            - target: http://httpbin.org/anything
+            - target: http://localhost/anything
               value: '2'
   timeout: 5000
diff --git a/test/data/apis/serviceDiscoveryConsulMiddleware.yml b/test/data/apis/serviceDiscoveryConsulMiddleware.yml
@@ -9,7 +9,7 @@ proxy:
         name: query
         options:
           param: apiVersion
-          defaultTarget: http://httpbin.org
+          defaultTarget: http://localhost
           destinations: 
             - target: testConsulService
               value: '1'

diff --git a/test/data/apis/simpleApi.json b/test/data/apis/simpleApi.json
@@ -4,7 +4,7 @@
     "path": "simple/",
     "proxy": {
         "target": {
-            "host": "http://httpbin.org"
+            "host": "http://localhost"
         },
         "timeout": 5000
     },

diff --git a/test/data/apis/trafficSplit.yml b/test/data/apis/trafficSplit.yml
@@ -9,8 +9,8 @@ proxy:
         name: trafficSplit
         options:
           destinations: 
-            - target: http://httpbin.org
+            - target: http://localhost
               weight: 75
-            - target: http://httpbin.org/anything
+            - target: http://localhost/anything
               weight: 25
   timeout: 5000
diff --git a/test/unit/proxy.spec.ts b/test/unit/proxy.spec.ts
@@ -118,11 +118,11 @@ describe('The Gateway Proxy', () => {
         gatewayRequest('/querySplit/get', (error: any, response: any, body: any) => {
             expect(response.statusCode).to.equal(200);
             const result = JSON.parse(body);
-            expect(result.url).to.equal('http://httpbin.org/get');
+            expect(result.url).to.equal('http://localhost/get');
             gatewayRequest('/querySplit/get?apiVersion=2', (err: any, res: any, b: any) => {
                 expect(res.statusCode).to.equal(200);
                 const result2 = JSON.parse(b);
-                expect(result2.url).to.equal('http://httpbin.org/anything/get?apiVersion=2');
+                expect(result2.url).to.equal('http://localhost/anything/get?apiVersion=2');
                 done();
             });
         });
@@ -131,14 +131,14 @@ describe('The Gateway Proxy', () => {
         gatewayRequest('/headerSplit/get', (error: any, response: any, body: any) => {
             expect(response.statusCode).to.equal(200);
             const result = JSON.parse(body);
-            expect(result.url).to.equal('http://httpbin.org/get');
+            expect(result.url).to.equal('http://localhost/get');
             gatewayRequest.get({
                 headers: { 'authorization': '2' },
                 url: '/headerSplit/get'
             }, (err: any, res: any, b: any) => {
                 expect(res.statusCode).to.equal(200);
                 const result2 = JSON.parse(b);
-                expect(result2.url).to.equal('http://httpbin.org/anything/get');
+                expect(result2.url).to.equal('http://localhost/anything/get');
                 done();
             });
         });