Get e2e passing

mitchmac · Feb 16, 2024 · ae43be1 · ae43be1
1 parent afe750a
commit ae43be1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -16,7 +16,7 @@ jobs:
         working-directory: ./tests/e2e
 
       - run: >
-          curl -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/index.php"}'
+          curl -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/index.php"}' | grep -q '{"statusCode":200,"headers"'
       
       - run: > 
           curl -s -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/index.php", "postRequestPlugin": "1"}' | grep -q '{"statusCode":201,"body":"Foo"}'

diff --git a/src/index.js b/src/index.js
@@ -23,7 +23,7 @@ async function handler(data) {
     const { event, docRoot } = data;
 
     const preRequestResponse = await plugins.executePreRequest(event);
-    if (preRequestResponse !== null) {
+    if (preRequestResponse != null) {
         return preRequestResponse;
     }
 

diff --git a/tests/e2e/local.sh b/tests/e2e/local.sh
@@ -4,13 +4,13 @@
 
 docker run -p 9000:8080 -d --name serverlesswp-local docker-lambda-serverlesswp
 
-curl -s -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/index.php"}' | grep -q '{"statusCode":200,"headers"'
+curl -s -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/index.php"}' | grep -q '{"statusCode":200,"headers"' || echo 'fail 1'
 
-curl -s -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/index.php", "postRequestPlugin": "1"}' | grep -q '{"statusCode":201,"body":"Foo"}'
+curl -s -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/index.php", "postRequestPlugin": "1"}' | grep -q '{"statusCode":201,"body":"Foo"}' || echo 'fail 2'
 
-curl -s -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/index.php", "preRequestPlugin": "1"}' | grep -q '{"statusCode":200,"body":"Foo"}'
+curl -s -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/index.php", "preRequestPlugin": "1"}' | grep -q '{"statusCode":200,"body":"Foo"}' || echo 'fail 3'
 
-curl -s -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/static.css"}' | grep -q 'background-color: blue'
+curl -s -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"path":"/static.css"}' | grep -q 'background-color: blue' || echo 'fail 4'
 
 docker stop serverlesswp-local
 docker rm serverlesswp-local
diff --git a/tests/e2e/test.js b/tests/e2e/test.js
@@ -5,7 +5,7 @@ serverlesswp.registerPlugin({
     name: 'postRequest',
     postRequest: async function(event, pluginResponse) {
         // Bypass this plugin conditionally
-        if (event.postRequestPlugin) {
+        if (event.hasOwnProperty("postRequestPlugin")) {
             return {
                 statusCode: pluginResponse.statusCode + 1,
                 body: 'Foo'
@@ -18,7 +18,7 @@ serverlesswp.registerPlugin({
     name: 'preRequest',
     preRequest: async function(event) {
         // Bypass this plugin conditionally
-        if (event.preRequestPlugin) {
+        if (event.hasOwnProperty("preRequestPlugin")) {
             return {
                 statusCode: 200,
                 body: 'Foo'