Revert "Use new expect() syntax in script templates (#5040)"

This reverts commit 506791b.

Author: oleiade

internal/cmd/templates/browser.js

@@ -1,8 +1,7 @@
 import http from "k6/http";
 import exec from 'k6/execution';
 import { browser } from "k6/browser";
-import { sleep, fail } from 'k6';
-import { expect } from "https://jslib.k6.io/k6-testing/0.5.0/index.js";
+import { sleep, check, fail } from 'k6';
 
 const BASE_URL = __ENV.BASE_URL || "https://quickpizza.grafana.com";
 
@@ -27,7 +26,9 @@ export const options = {
 
 export function setup() {
   let res = http.get(BASE_URL);
-  expect(res.status, `Got unexpected status code ${res.status} when trying to setup. Exiting.`).toBe(200);
+  if (res.status !== 200) {
+    exec.test.abort(`Got unexpected status code ${res.status} when trying to setup. Exiting.`);
+  }
 }
 
 export default async function() {
@@ -36,13 +37,21 @@ export default async function() {
 
   try {
     await page.goto(BASE_URL);
-    await expect.soft(page.locator("h1")).toHaveText("Looking to break out of your pizza routine?");
+
+    checkData = await page.locator("h1").textContent();
+    check(page, {
+      header: checkData === "Looking to break out of your pizza routine?",
+    });
 
     await page.locator('//button[. = "Pizza, Please!"]').click();
     await page.waitForTimeout(500);
 
     await page.screenshot({ path: "screenshot.png" });
-    await expect.soft(page.locator("div#recommendations")).not.toHaveText("");
+
+    checkData = await page.locator("div#recommendations").textContent();
+    check(page, {
+      recommendation: checkData !== "",
+    });
   } catch (error) {
     fail(`Browser iteration failed: ${error.message}`);
   } finally {

internal/cmd/templates/minimal.js

@@ -1,6 +1,5 @@
 import http from 'k6/http';
-import { sleep } from 'k6';
-import { expect } from "https://jslib.k6.io/k6-testing/0.5.0/index.js";
+import { sleep, check } from 'k6';
 
 export const options = {
   vus: 10,
@@ -13,6 +12,6 @@ export const options = {
 
 export default function() {
   let res = http.get('https://quickpizza.grafana.com');
-  expect.soft(res.status).toBe(200);
+  check(res, { "status is 200": (res) => res.status === 200 });
   sleep(1);
 }

internal/cmd/templates/protocol.js

@@ -1,7 +1,6 @@
 import http from "k6/http";
 import exec from 'k6/execution';
-import { sleep } from "k6";
-import { expect } from "https://jslib.k6.io/k6-testing/0.5.0/index.js";
+import { check, sleep } from "k6";
 
 const BASE_URL = __ENV.BASE_URL || 'https://quickpizza.grafana.com';
 
@@ -23,7 +22,9 @@ export const options = {
 
 export function setup() {
   let res = http.get(BASE_URL);
-  expect(res.status, `Got unexpected status code ${res.status} when trying to setup. Exiting.`).toBe(200);
+  if (res.status !== 200) {
+    exec.test.abort(`Got unexpected status code ${res.status} when trying to setup. Exiting.`);
+  }
 }
 
 export default function() {
@@ -43,7 +44,7 @@ export default function() {
     },
   });
 
-  expect.soft(res.status).toBe(200);
+  check(res, { "status is 200": (res) => res.status === 200 });
   console.log(res.json().pizza.name + " (" + res.json().pizza.ingredients.length + " ingredients)");
   sleep(1);
 }