fix: workflow and pytest for remote execution (#22)

Author: jgoddard19

.github/workflows/flow-cycle-payment-scenarios.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Reset all scenarios
         run: |
           echo "Resetting all payment scenarios..."
-          curl -X POST "${{ secrets.SCENARIO_SERVICE_URL }}/scenario-runner/api/payment-scenarios/reset"
+          curl -X POST "${{ vars.SCENARIO_SERVICE_URL }}/api/payment-scenarios/reset"
           sleep 2
 
       - name: Select random scenario
@@ -28,21 +28,21 @@ jobs:
         if: steps.random.outputs.scenario == '1'
         run: |
           echo "Enabling Gateway Timeout scenario (15% probability, 15s delay)"
-          curl -X POST "${{ secrets.SCENARIO_SERVICE_URL }}/scenario-runner/api/payment-scenarios/gateway-timeout?enabled=true&probability=15.0&delay=15"
+          curl -X POST "${{ vars.SCENARIO_SERVICE_URL }}/api/payment-scenarios/gateway-timeout?enabled=true&probability=15.0&delay=15"
 
       - name: Enable Card Decline (Scenario 2)
         if: steps.random.outputs.scenario == '2'
         run: |
           echo "Enabling Card Decline scenario (20% probability)"
-          curl -X POST "${{ secrets.SCENARIO_SERVICE_URL }}/scenario-runner/api/payment-scenarios/card-decline?enabled=true&probability=20.0"
+          curl -X POST "${{ vars.SCENARIO_SERVICE_URL }}/api/payment-scenarios/card-decline?enabled=true&probability=20.0"
 
       - name: Enable Stolen Card (Scenario 3)
         if: steps.random.outputs.scenario == '3'
         run: |
           echo "Enabling Stolen Card scenario (10% probability)"
-          curl -X POST "${{ secrets.SCENARIO_SERVICE_URL }}/scenario-runner/api/payment-scenarios/stolen-card?enabled=true&probability=10.0"
+          curl -X POST "${{ vars.SCENARIO_SERVICE_URL }}/api/payment-scenarios/stolen-card?enabled=true&probability=10.0"
 
       - name: Verify scenario configuration
         run: |
           echo "Current scenario configuration:"
-          curl "${{ secrets.SCENARIO_SERVICE_URL }}/scenario-runner/api/payment-scenarios"
+          curl "${{ vars.SCENARIO_SERVICE_URL }}/api/payment-scenarios"

tests/README.md

@@ -20,11 +20,26 @@ This directory contains automated tests for the Relibank payment failure scenari
 
 ## Running the Tests
 
-### Run All Tests
+### Run All Tests Locally
 ```bash
 pytest tests/test_payment_scenarios.py -v -s
 ```
 
+### Run Tests Against Remote Environment
+To test against a remote deployment, set the environment variables:
+
+```bash
+# Example: Testing against a remote server
+export SCENARIO_SERVICE_URL="https://your-server.example.com/scenario-runner"
+export BASE_URL="https://your-server.example.com"
+pytest tests/test_payment_scenarios.py -v -s
+```
+
+Or as a one-liner:
+```bash
+SCENARIO_SERVICE_URL="https://your-server.example.com/scenario-runner" BASE_URL="https://your-server.example.com" pytest tests/test_payment_scenarios.py -v -s
+```
+
 ### Run Individual Tests
 ```bash
 # Test gateway timeout scenario
@@ -213,13 +228,14 @@ These tests can be added to GitHub Actions or other CI pipelines:
 
 ```yaml
 - name: Run payment scenario tests
+  env:
+    SCENARIO_SERVICE_URL: ${{ vars.SCENARIO_SERVICE_URL }}
+    BASE_URL: ${{ vars.BASE_URL }}
   run: |
     pip install pytest requests
     pytest tests/test_payment_scenarios.py -v
 ```
 
-For CI environments, update service URLs in the test file or use environment variables:
-```python
-SCENARIO_SERVICE_URL = os.getenv("SCENARIO_SERVICE_URL", "http://localhost:8000")
-BILL_PAY_SERVICE_URL = os.getenv("BILL_PAY_SERVICE_URL", "http://localhost:5000")
-```
+The tests automatically use environment variables for configuration:
+- `SCENARIO_SERVICE_URL`: URL to the scenario runner service (default: `http://localhost:8000/scenario-runner`)
+- `BASE_URL`: Base URL to the bill pay service (default: `http://localhost:5000`)

tests/test_payment_scenarios.py

@@ -1,29 +1,30 @@
 import pytest
 import requests
 import time
+import os
 from typing import Dict, List
 
-# Configuration
-SCENARIO_SERVICE_URL = "http://localhost:8000"
-BILL_PAY_SERVICE_URL = "http://localhost:5000"
+# Configuration - use environment variables with local defaults
+SCENARIO_SERVICE_URL = os.getenv("SCENARIO_SERVICE_URL", "http://localhost:8000/scenario-runner")
+BILL_PAY_SERVICE_URL = os.getenv("BASE_URL", "http://localhost:5000")
 NUM_PAYMENT_ATTEMPTS = 50  # Send enough to trigger scenarios
 
 @pytest.fixture
 def reset_scenarios():
     """Reset all scenarios before and after tests"""
-    response = requests.post(f"{SCENARIO_SERVICE_URL}/scenario-runner/api/payment-scenarios/reset")
+    response = requests.post(f"{SCENARIO_SERVICE_URL}/api/payment-scenarios/reset")
     assert response.status_code == 200
     yield
     # Cleanup after test
-    requests.post(f"{SCENARIO_SERVICE_URL}/scenario-runner/api/payment-scenarios/reset")
+    requests.post(f"{SCENARIO_SERVICE_URL}/api/payment-scenarios/reset")
 
 
 def enable_scenario(scenario_name: str, probability: float = None, delay: float = None) -> Dict:
     """Enable a payment scenario"""
     endpoints = {
-        "gateway_timeout": f"{SCENARIO_SERVICE_URL}/scenario-runner/api/payment-scenarios/gateway-timeout",
-        "card_decline": f"{SCENARIO_SERVICE_URL}/scenario-runner/api/payment-scenarios/card-decline",
-        "stolen_card": f"{SCENARIO_SERVICE_URL}/scenario-runner/api/payment-scenarios/stolen-card"
+        "gateway_timeout": f"{SCENARIO_SERVICE_URL}/api/payment-scenarios/gateway-timeout",
+        "card_decline": f"{SCENARIO_SERVICE_URL}/api/payment-scenarios/card-decline",
+        "stolen_card": f"{SCENARIO_SERVICE_URL}/api/payment-scenarios/stolen-card"
     }
 
     params = {"enabled": True}
@@ -196,7 +197,7 @@ def test_scenario_reset(reset_scenarios):
     enable_scenario("stolen_card", probability=100.0)
 
     # Reset all scenarios
-    response = requests.post(f"{SCENARIO_SERVICE_URL}/scenario-runner/api/payment-scenarios/reset")
+    response = requests.post(f"{SCENARIO_SERVICE_URL}/api/payment-scenarios/reset")
     assert response.status_code == 200
     print("Reset all scenarios")