From a5b8b58ed3210db560f6c98505bc5193f9e5f05c Mon Sep 17 00:00:00 2001
From: tanvigour <60332928+tanvigour@users.noreply.github.com>
Date: Tue, 8 Mar 2022 15:14:45 -0500
Subject: [PATCH] Fix pubsub JS tests (#582)

Signed-off-by: tanvigour <tanvi.gour@gmail.com>
---
 pub_sub/javascript/http/README.md | 50 +++++++++++--------------------
 pub_sub/javascript/sdk/README.md  | 46 ++++++++++------------------
 2 files changed, 33 insertions(+), 63 deletions(-)

diff --git a/pub_sub/javascript/http/README.md b/pub_sub/javascript/http/README.md
index b5a5baf7..05ce1abd 100644
--- a/pub_sub/javascript/http/README.md
+++ b/pub_sub/javascript/http/README.md
@@ -16,84 +16,70 @@ And one subscriber:
 
 ### Run Node message publisher with Dapr
 
-1. Open a new terminal window and navigate to `checkout` directory: 
-
-```bash
-cd checkout
-```
-
-2. Install dependencies: 
+1. Install dependencies: 
 
 <!-- STEP
 name: Install Node dependencies
-working_dir: ./checkout
 -->
 
 ```bash
+cd pub_sub/javascript/http/checkout
 npm install
 ```
-
-3. Run the Node publisher app with Dapr: 
+<!-- END_STEP -->
+2. Run the Node publisher app with Dapr: 
 
 <!-- STEP
 name: Run Node publisher
 expected_stdout_lines:
   - "You're up and running! Both Dapr and your app logs will appear here."
-  - '== APP == Received message "Message on A" on topic "A"'
-  - '== APP == Received message "Message on C" on topic "C"'
-  - "Exited Dapr successfully"
+  - '== APP == Published data: {"orderId":2}'
+  - '== APP == Published data: {"orderId":3}'
   - "Exited App successfully"
+  - "Exited Dapr successfully"
 expected_stderr_lines:
-output_match_mode: substring
 working_dir: ./checkout
+output_match_mode: substring
 background: true
 sleep: 10
 -->
     
 ```bash
-npm start:dapr
+dapr run --app-id checkout --components-path ../../../components/  --app-port 5001 -- node .
 ```
 
 <!-- END_STEP -->
 ### Run Node message subscriber with Dapr
 
-1. Open a new terminal window and navigate to `order-processor` directory: 
-
-```bash
-cd order-processor
-```
-
-2. Install dependencies: 
+1. Install dependencies: 
 
 <!-- STEP
 name: Install Node dependencies
-working_dir: ./order-processor
 -->
 
 ```bash
+cd pub_sub/javascript/http/order-processor
 npm install
 ```
-
-3. Run the Node subscriber app with Dapr: 
+<!-- END_STEP -->
+2. Run the Node publisher app with Dapr: 
 
 <!-- STEP
-name: Run Node subscriber
+name: Run Node publisher
 expected_stdout_lines:
   - "You're up and running! Both Dapr and your app logs will appear here."
-  - '== APP == Received message "Message on A" on topic "A"'
-  - '== APP == Received message "Message on C" on topic "C"'
+  - '== APP == Subscriber received: {"orderId":6}'
   - "Exited Dapr successfully"
   - "Exited App successfully"
 expected_stderr_lines:
-output_match_mode: substring
 working_dir: ./order-processor
+output_match_mode: substring
 background: true
 sleep: 10
 -->
-
-
+    
 ```bash
-npm start:dapr
+dapr run --app-id checkout --components-path ../../../components/  --app-port 5001 -- node .
 ```
 
 <!-- END_STEP -->
\ No newline at end of file
diff --git a/pub_sub/javascript/sdk/README.md b/pub_sub/javascript/sdk/README.md
index 2bef6e43..c8da6940 100644
--- a/pub_sub/javascript/sdk/README.md
+++ b/pub_sub/javascript/sdk/README.md
@@ -16,84 +16,68 @@ And one subscriber:
 
 ### Run Node message publisher with Dapr
 
-1. Open a new terminal window and navigate to `checkout` directory: 
-
-```bash
-cd checkout
-```
-
-2. Install dependencies: 
+1. Install dependencies: 
 
 <!-- STEP
 name: Install Node dependencies
-working_dir: ./checkout
 -->
 
 ```bash
+cd pub_sub/javascript/sdk/checkout
 npm install
 ```
-
+<!-- END_STEP -->
 3. Run the Node publisher app with Dapr: 
 
 <!-- STEP
 name: Run Node publisher
 expected_stdout_lines:
   - "You're up and running! Both Dapr and your app logs will appear here."
-  - '== APP == Received message "Message on A" on topic "A"'
-  - '== APP == Received message "Message on C" on topic "C"'
-  - "Exited Dapr successfully"
+  - '== APP == Published data: {"orderId":2}'
+  - '== APP == Published data: {"orderId":3}'
   - "Exited App successfully"
+  - "Exited Dapr successfully"
 expected_stderr_lines:
 output_match_mode: substring
-working_dir: ./checkout
 background: true
 sleep: 10
 -->
     
 ```bash
-npm start:dapr
+dapr run --app-id checkout --components-path pub_sub/components/  --app-port 5001 -- node pub_sub/javascript/sdk/checkout/
 ```
 
 <!-- END_STEP -->
 ### Run Node message subscriber with Dapr
 
-1. Open a new terminal window and navigate to `checkout` directory: 
-
-```bash
-cd order-processor
-```
-
-2. Install dependencies: 
+1. Install dependencies: 
 
 <!-- STEP
 name: Install Node dependencies
-working_dir: ./order-processor
 -->
 
 ```bash
+cd pub_sub/javascript/sdk/order-processor
 npm install
 ```
-
-3. Run the Node subscriber app with Dapr: 
+<!-- END_STEP -->
+3. Run the Node publisher app with Dapr: 
 
 <!-- STEP
-name: Run Node subscriber
+name: Run Node publisher
 expected_stdout_lines:
   - "You're up and running! Both Dapr and your app logs will appear here."
-  - '== APP == Received message "Message on A" on topic "A"'
-  - '== APP == Received message "Message on C" on topic "C"'
+  - '== APP == Subscriber received: {"orderId":6}'
   - "Exited Dapr successfully"
   - "Exited App successfully"
 expected_stderr_lines:
 output_match_mode: substring
-working_dir: ./order-processor
 background: true
 sleep: 10
 -->
-
-
+    
 ```bash
-npm start:dapr
+dapr run --app-id checkout --components-path pub_sub/components/  --app-port 5001 -- node pub_sub/javascript/sdk/order-processor/
 ```
 
 <!-- END_STEP -->
\ No newline at end of file