Merge origin/master into copilot/add-install-skills-command

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Burgyn

.claude/skills/teapie/SKILL.md

@@ -1,24 +1,30 @@
 ---
 name: teapie
-description: Comprehensive TeaPie framework expertise for API integration testing. Use when: (1) Working with TeaPie projects, API testing, .http files, C# test scripts (.csx), test collections, directives, variables, functions, authentication, retrying, (2) Creating and scaffolding test cases using `teapie generate`, renumbering tests, initializing TeaPie projects, (3) Running tests with `teapie test`, finding tests for API endpoints, debugging test failures, generating reports, (4) Analyzing .teapie folder structure, discovering custom functions/directives/auth providers registered in init.csx, understanding project-specific configurations, or (5) When users need guidance on TeaPie CLI commands, test structure, framework capabilities, or test organization.
+description: Comprehensive TeaPie framework expertise for API integration testing. Use when: (1) Working with TeaPie projects, API testing, .http files, .tp files, C# test scripts (.csx), test collections, directives, variables, functions, authentication, retrying, (2) Creating and scaffolding test cases using `teapie generate`, renumbering tests, initializing TeaPie projects, (3) Running tests with `teapie test`, finding tests for API endpoints, debugging test failures, generating reports, (4) Analyzing .teapie folder structure, discovering custom functions/directives/auth providers registered in init.csx, understanding project-specific configurations, or (5) When users need guidance on TeaPie CLI commands, test structure, framework capabilities, or test organization.
 ---
 
 # TeaPie Framework
 
 ## Overview
 
-TeaPie (TEsting API Extension) is a lightweight CLI tool for API testing that combines `.http` files with C# scripts for comprehensive integration testing. This skill provides expert knowledge on all TeaPie capabilities, syntax, and best practices.
+TeaPie (TEsting API Extension) is a lightweight CLI tool for API testing that combines `.http` files with C# scripts or uses `.tp` files that cover both types of files within one for comprehensive integration testing. This skill provides expert knowledge on all TeaPie capabilities, syntax, and best practices.
 
 ## Quick Reference
 
 ### Test Case Structure
 
-Each test case consists of:
+TeaPie supports two equivalent formats. Choose based on script complexity and structure preferences; both can coexist in the same collection.
+
+**Multi-file format:**
 
 - **`<name>-req.http`** (required) - HTTP request file (one or more requests)
 - **`<name>-init.csx`** (optional) - Pre-request script for setup
 - **`<name>-test.csx`** (optional) - Post-response script for validation
 
+**Single-file format (`.tp`):**
+
+- **`<name>.tp`** - All sections in one file using markers: `--- TESTCASE`, `--- INIT`, `--- HTTP`, `--- TEST`, `--- END`
+
 ### Naming Convention
 
 Use zero-padded numeric prefixes for ordering:
@@ -55,7 +61,7 @@ teapie test [path]                 # Run tests (default command)
 teapie generate <name> [-i] [-t]   # Scaffold new test case
 teapie init                        # Initialize .teapie folder
 teapie explore [path]              # Explore collection structure
-teapie compile|comp|c <path>       # Attempt to compile the C# script at the specified path to check for compile-time errors
+teapie compile|comp|c <path>       # Compile C# script (.csx) or test case (.tp) at the specified path to check for compile-time errors
 ```
 
 ### Directives

.claude/skills/teapie/references/cli-commands.md

@@ -16,7 +16,7 @@ teapie test [path] [--temp-path <path>] [-e|--env <envName>] [--env-file <file>]
 
 **Arguments:**
 
-- `path` - Path to the collection or test case. Defaults to current directory.
+- `path` - Path to the collection, test case (`.http`), or single-file test case (`.tp`). Defaults to current directory.
 
 **Options:**
 
@@ -112,7 +112,7 @@ teapie explore [path] [--env-file <file>] [-i|--init-script <script>] [logging o
 
 **Arguments:**
 
-- `path` - Path to collection or test case. Defaults to current directory.
+- `path` - Path to collection, request file (`.http`), or single-file test case (`.tp`). Defaults to current directory.
 
 **Options:**
 
@@ -125,7 +125,7 @@ teapie explore [path] [--env-file <file>] [-i|--init-script <script>] [logging o
 
 **Command name:** `compile`, `comp`, or `c`
 
-**Purpose:** Compile a script at the specified path. Check for compile-time exceptions.
+**Purpose:** Compile a script or test case at the specified path. Check for compile-time exceptions.
 
 **Full Syntax:**
 
@@ -135,7 +135,7 @@ teapie compile <path> [logging options...] [--no-logo]
 
 **Arguments:**
 
-- `path` - Path to script to compile (required).
+- `path` - Path to script (`.csx`) or test case file (`.tp`) to compile. For `.tp` files, INIT and TEST sections are compiled. Required.
 
 **Options:**
 

.claude/skills/teapie/references/test-structure.md

@@ -4,15 +4,24 @@ Complete reference for TeaPie test case and collection structure.
 
 ## Test Case Structure
 
-### Required Files
+TeaPie supports two equivalent formats. Choose based on script complexity and structure preferences; both can coexist in the same collection.
+
+### Multi-File Format
+
+**Required:**
 
 - **`<name>-req.http`** - Request file containing HTTP request(s). Must follow Microsoft HTTP file conventions.
 
-### Optional Files
+**Optional:**
 
 - **`<name>-init.csx`** - Pre-request script for data setup and initialization
 - **`<name>-test.csx`** - Post-response script for validation and assertions
 
+### Single-File Format (`.tp`)
+
+- **`<name>.tp`** - All sections in one file using markers: `--- TESTCASE`, `--- INIT`, `--- HTTP`, `--- TEST`, `--- END`
+- Optional alternative to multi-file format; supports single or multiple test cases per file
+
 ### File Naming Convention
 
 **Pattern:** `<prefix>-<descriptive-name>-<suffix>.<ext>`
@@ -51,7 +60,8 @@ Tests/
 │   ├── 002-Edit-Car-test.csx
 │   ├── 003-Check-Car-init.csx
 │   ├── 003-Check-Car-req.http
-│   └── 003-Check-Car-test.csx
+│   ├── 003-Check-Car-test.csx
+│   └── 004-Car-Operations.tp   # Single-file format (optional alternative)
 └── 003-Car-Rentals/            # Another collection
     ├── 001-Rent-Car-init.csx
     ├── 001-Rent-Car-req.http
@@ -86,12 +96,12 @@ Collections can contain optional files:
 
 Test cases are executed in alphabetical order (ensured by numeric prefixes):
 
-1. Structure exploration - Scans for test cases and related files
+1. Structure exploration - Scans for test cases (`-req.http` files and `.tp` files) and related files
 2. Initialization script execution (if present)
 3. For each test case (in alphabetical order):
-   - Pre-request script execution (`-init.csx`)
-   - HTTP request(s) execution (`-req.http`)
-   - Post-response script execution (`-test.csx`)
+   - Pre-request script execution (`-init.csx` or `--- INIT` section in `.tp`)
+   - HTTP request(s) execution (`-req.http` or `--- HTTP` section in `.tp`)
+   - Post-response script execution (`-test.csx` or `--- TEST` section in `.tp`)
 
 ## .teapie Folder Structure
 
@@ -128,11 +138,12 @@ The `$teapie` wildcard resolves to the absolute path of the `.teapie` folder, av
 TeaPie discovers test cases by:
 
 1. Recursively scanning directories (depth-first)
-2. Finding all `.http` files ending with `-req.http`
-3. Matching associated scripts by name:
+2. Finding all `.http` files ending with `-req.http` and all `.tp` files
+3. For multi-file format: matching associated scripts by name:
    - `{test-case-name}-init.csx` for pre-request
    - `{test-case-name}-test.csx` for post-response
-4. Processing files in alphabetical order (ensured by numerical prefixes)
+4. For `.tp` format: parsing section markers within the file
+5. Processing files in alphabetical order (ensured by numerical prefixes)
 
 ## Best Practices
 
@@ -160,6 +171,7 @@ This ensures consistent ordering across all environments and prevents incorrect
 - `001-Add-Customer-req.http` - Creates a new customer
 - `002-Edit-Customer-req.http` - Updates an existing customer
 - `003-Delete-Customer-req.http` - Deletes a customer
+- `004-Car-Operations.tp` - Single-file format with multiple test cases
 
 ### Multiple Requests in One File
 

.editorconfig

@@ -432,6 +432,10 @@ dotnet_diagnostic.IDE0130.severity = warning
 
 ## Analyzers by file
 
+[tests/TeaPie.Tests/Integration/DemoProjectShould.cs]
+# IDE0005: Testcontainers Containers namespace is required for IContainer; analyzer incorrectly flags it
+dotnet_diagnostic.IDE0005.severity = none
+
 [*{Query,Command,Should,Test,Tests}.cs]
 
 # CA1034: Do not nest type. Alternatively, change its accessibility so that it is not externally visible.

.github/workflows/pipeline.yml

@@ -91,4 +91,4 @@ jobs:
         run: dotnet pack --configuration Release --no-build
 
       - name: Find and Publish NuGet Package
-        run: dotnet nuget push $(find . -type f -name "*.nupkg") --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+        run: dotnet nuget push $(find ./src -type f -name "*.nupkg") --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate

Directory.Packages.props

@@ -22,12 +22,14 @@
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="Spectre.Console.Cli" Version="0.50.0" />
+    <PackageVersion Include="Testcontainers" Version="4.8.0" />
     <PackageVersion Include="Spectre.Console.Testing" Version="0.50.0" />
     <PackageVersion Include="Spectre.Console" Version="0.50.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta7.25380.108" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.assert" Version="2.9.3" />
+    <PackageVersion Include="Verify.Xunit" Version="31.9.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
   </ItemGroup>
 </Project>

README.md

@@ -6,7 +6,7 @@
 
 ![Logo](logo.png)
 
-TeaPie is a **lightweight API testing framework** designed for **automation-friendly, scriptable API testing** with `.http` files.
+TeaPie is a **lightweight API testing framework** designed for **automation-friendly, scriptable API testing** with `.http` and `.tp` files.
 It provides **pre-request scripting, post-response validation, retry strategies, flexible authentication, environments support and custom test directives**.
 
 ## 📖 Documentation
@@ -17,6 +17,8 @@ It provides **pre-request scripting, post-response validation, retry strategies,
 
 ✅ **Universal HTTP Requests Definition** – Define HTTP requests using `.http` files
 
+✅ **Flexible Test Structure** – Use multi-file (`.http` + `.csx`) or single-file (`.tp`) format based on your needs
+
 ✅ **Pre-Request & Post-Response Scripts** – Extend HTTP request with C# scripts for data
 
 ✅ **Custom Authentication Providers** – Supports OAuth2 & user-defined authentication providers
@@ -77,6 +79,12 @@ Execute a single test case:
 teapie test ".\demo\Tests\002-Cars\002-Edit-Car-req.http"
 ```
 
+Or run a single-file test case (`.tp`):
+
+```sh
+teapie test ".\demo\Tests\002-Cars\004-Car-Operations.tp"
+```
+
 For more usage details, visit the **[Wiki](https://kros-sk.github.io/TeaPie/docs/introduction.html)**.
 
 ## 🤝 Contributing

demo/Tests/002-Cars/004-Car-Operations.tp

@@ -0,0 +1,60 @@
+// This file uses the single-file (.tp) format. A .tp file can contain one or more test cases,
+// each defined by section markers: --- TESTCASE, --- INIT, --- HTTP, --- TEST, and --- END.
+//
+// --- TESTCASE <Name>  Starts a named test case (required when multiple test cases are in one file).
+// --- INIT             Pre-request C# script (optional). Same role as <name>-init.csx.
+// --- HTTP             HTTP request definition (required). Same format as .http files.
+// --- TEST             Post-response validation script (optional). Same role as <name>-test.csx.
+// --- END              Ends the current test case block.
+//
+// Both .tp and multi-file formats can co-exist in the same collection.
+
+--- TESTCASE Add Another Car
+
+--- INIT
+// Load the shared car generator definition.
+#load "$teapie/Definitions/GenerateNewCar.csx"
+
+var car = GenerateCar();
+tp.SetVariable("AnotherCar", car.ToJsonString(), "cars");
+
+--- HTTP
+## TEST-EXPECT-STATUS: [201]
+## TEST-HAS-BODY
+// Add a new car using data prepared in the INIT section.
+# @name AddAnotherCarRequest
+POST {{ApiBaseUrl}}{{ApiCarsSection}}
+Content-Type: application/json
+
+{{AnotherCar}}
+
+--- TEST
+await tp.Test("Newly added car should be returned with an assigned Id.", async () =>
+{
+    dynamic responseJson = await tp.Responses["AddAnotherCarRequest"].GetBodyAsExpandoAsync();
+    NotNull(responseJson);
+    True(responseJson.Id > 0);
+
+    // Store the Id for later use within this file.
+    tp.SetVariable("AnotherCarId", (long)responseJson.Id, "cars");
+});
+
+--- END
+
+--- TESTCASE Get All Cars
+
+--- HTTP
+## TEST-EXPECT-STATUS: [200]
+## TEST-HAS-BODY
+// Retrieve the full list of cars.
+# @name GetAllCarsRequest
+GET {{ApiBaseUrl}}{{ApiCarsSection}}
+
+--- TEST
+tp.Test("Response body should not be empty.", () =>
+{
+    NotNull(tp.Response);
+    NotNull(tp.Response.Content);
+});
+
+--- END

demo/Tests/004-Health/001-Health-Check.tp

@@ -0,0 +1,17 @@
+--- TESTCASE Health Check
+
+--- HTTP
+## TEST-EXPECT-STATUS: [200]
+## TEST-HAS-BODY
+# This test case uses the .tp format - a single file combining HTTP request and test script.
+GET {{ApiBaseUrl}}/health
+
+--- TEST
+tp.Test("Health response should contain status field.", async () =>
+{
+    dynamic responseJson = await tp.Response.GetBodyAsExpandoAsync();
+    NotNull(responseJson);
+    NotNull(responseJson.status);
+});
+
+--- END

demo/server/CarRentalServer.json

@@ -95,6 +95,35 @@
       ],
       "responseMode": null
     },
+    {
+      "uuid": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+      "type": "http",
+      "documentation": "Health check endpoint",
+      "method": "get",
+      "endpoint": "health",
+      "responses": [
+        {
+          "uuid": "b2c3d4e5-f6a7-8901-bcde-f12345678901",
+          "body": "{\"status\": \"healthy\"}",
+          "latency": 0,
+          "statusCode": 200,
+          "label": "Healthy",
+          "headers": [],
+          "bodyType": "INLINE",
+          "filePath": "",
+          "databucketID": "",
+          "sendFileAsBody": false,
+          "rules": [],
+          "rulesOperator": "OR",
+          "disableTemplating": false,
+          "fallbackTo404": false,
+          "default": true,
+          "crudKey": "id",
+          "callbacks": []
+        }
+      ],
+      "responseMode": null
+    },
     {
       "uuid": "d4c7ea29-0855-433b-b9cb-992991ce3afe",
       "type": "http",
@@ -151,6 +180,10 @@
       "type": "route",
       "uuid": "ab6eecbe-7d35-4b3d-8a26-552bd3154ef4"
     },
+    {
+      "type": "route",
+      "uuid": "a1b2c3d4-e5f6-7890-abcd-ef1234567890"
+    },
     {
       "type": "route",
       "uuid": "d4c7ea29-0855-433b-b9cb-992991ce3afe"