refactor: rename recording verification to verification

src/codegen/codegen.test.ts

@@ -203,8 +203,12 @@ describe('Code generation', () => {
  it('should generate checks', () => {
  const rules: TestRule[] = [
  {
- type: 'recording-verification',
+ type: 'verification',
  id: '1',
+ filter: { path: '' },
+ value: {
+ type: 'recordedValue',
+ },
  },
  ]
  const correlationStateMap: CorrelationStateMap = {}
@@ -221,7 +225,7 @@ describe('Code generation', () => {
  params = { headers: {}, cookies: {} }
  url = http.url\`http://test.k6.io/api/v1/foo\`
  resp = http.request('POST', url, null, params)
- check(resp,{'RecordingVerificationRule:statusmatchesrecording':(r)=>r.status===200,})
+ check(resp,{'statusmatches200':(r)=>r.status===200,})
 
  `
 

src/rules/rules.ts

@@ -4,7 +4,7 @@ import { CorrelationStateMap, TestRule } from '@/types/rules'
 import { exhaustive } from '../utils/typescript'
 import { applyCustomCodeRule } from './customCode'
 import { applyCorrelationRule } from './correlation'
-import { applyRecordingVerificationRule } from './verification'
+import { applyVerificationRule } from './verification'
 
 export function applyRule(
  requestSnippetSchema: RequestSnippetSchema,
@@ -24,9 +24,7 @@ export function applyRule(
  )
  case 'parameterization':
  case 'verification':
- return requestSnippetSchema
- case 'recording-verification':
- return applyRecordingVerificationRule(requestSnippetSchema)
+ return applyVerificationRule(requestSnippetSchema)
  default:
  return exhaustive(rule)
  }

src/rules/utils.ts

@@ -44,9 +44,6 @@ export function matchFilter(
  const { filter } = rule
  return new RegExp(filter.path).test(request.url)
  }
- case 'recording-verification':
- // NOTE: no filtering yet on recording verification
- return true
  default:
  return exhaustive(rule)
  }

src/rules/verification.ts

@@ -1,6 +1,6 @@
 import { RequestSnippetSchema } from '@/types'
 
-export function applyRecordingVerificationRule(
+export function applyVerificationRule(
  requestSnippetSchema: RequestSnippetSchema
 ): RequestSnippetSchema {
  const response = requestSnippetSchema.data.response
@@ -11,7 +11,7 @@ export function applyRecordingVerificationRule(
 
  const verificationSnippet = `
 check(resp, {
- 'Recording Verification Rule: status matches recording': (r) => r.status === ${response.statusCode},
+ 'status matches ${response.statusCode}': (r) => r.status === ${response.statusCode},
  })
 `
  return {

src/schemas/rules.ts

@@ -111,7 +111,7 @@ export const CorrelationRuleSchema = RuleBaseSchema.extend({
 export const VerificationRuleSchema = RuleBaseSchema.extend({
  type: z.literal('verification'),
  filter: FilterSchema,
- selector: VerificationRuleSelectorSchema,
+ selector: VerificationRuleSelectorSchema.optional(),
  value: z.discriminatedUnion('type', [
  VariableValueSchema,
  ArrayValueSchema,
@@ -120,10 +120,6 @@ export const VerificationRuleSchema = RuleBaseSchema.extend({
  ]),
 })
 
-export const RecordingVerificationRuleSchema = RuleBaseSchema.extend({
- type: z.literal('recording-verification'),
-})
-
 export const CustomCodeRuleSchema = RuleBaseSchema.extend({
  type: z.literal('customCode'),
  filter: FilterSchema,
@@ -136,5 +132,4 @@ export const TestRuleSchema = z.discriminatedUnion('type', [
  CorrelationRuleSchema,
  VerificationRuleSchema,
  CustomCodeRuleSchema,
- RecordingVerificationRuleSchema,
 ])

src/types/rules.ts

@@ -13,7 +13,6 @@ import {
  JsonSelectorSchema,
  ParameterizationRuleSchema,
  RecordedValueSchema,
- RecordingVerificationRuleSchema,
  RegexSelectorSchema,
  RuleBaseSchema,
  SelectorSchema,
@@ -55,7 +54,4 @@ export type ParameterizationRule = z.infer<typeof ParameterizationRuleSchema>
 export type CorrelationRule = z.infer<typeof CorrelationRuleSchema>
 export type VerificationRule = z.infer<typeof VerificationRuleSchema>
 export type CustomCodeRule = z.infer<typeof CustomCodeRuleSchema>
-export type RecordingVerificationRule = z.infer<
- typeof RecordingVerificationRuleSchema
->
 export type TestRule = z.infer<typeof TestRuleSchema>

src/utils/generator.ts

@@ -22,7 +22,7 @@ export function createNewGeneratorFile(recordingPath = ''): GeneratorFileData {
  testData: {
  variables: [],
  },
- rules: [createEmptyRule('recording-verification')],
+ rules: [createEmptyRule('verification')],
  allowlist: [],
  includeStaticAssets: false,
  }

src/utils/rules.ts

@@ -52,10 +52,5 @@ export function createEmptyRule(type: TestRule['type']): TestRule {
  type: 'recordedValue',
  },
  }
- case 'recording-verification':
- return {
- type: 'recording-verification',
- id: self.crypto.randomUUID(),
- }
  }
 }

src/views/Generator/RuleEditor/RuleEditor.tsx

@@ -21,8 +21,6 @@ export function RuleEditorSwitch() {
  case 'customCode':
  return <CustomCodeEditor />
  case 'parameterization':
- case 'verification':
- case 'recording-verification':
  return (
  <Callout.Root>
  <Callout.Icon>
@@ -31,6 +29,17 @@ export function RuleEditorSwitch() {
  <Callout.Text>Not implemented yet</Callout.Text>
  </Callout.Root>
  )
+ case 'verification':
+ return (
+ <Callout.Root>
+ <Callout.Icon>
+ <InfoCircledIcon />
+ </Callout.Icon>
+ <Callout.Text>
+ Verification rule configuration is coming soon
+ </Callout.Text>
+ </Callout.Root>
+ )
  default:
  return exhaustive(ruleType)
  }

src/views/Generator/RulePreview/RulePreview.tsx

@@ -16,7 +16,6 @@ export function RulePreview() {
  case 'customCode':
  case 'parameterization':
  case 'verification':
- case 'recording-verification':
  return null
 
  default:

src/views/Generator/TestRuleContainer/TestRule/TestRuleInlineContent.tsx

@@ -7,6 +7,7 @@ import {
  BorderLeftIcon,
  BorderRightIcon,
  EyeOpenIcon,
+ DiscIcon,
 } from '@radix-ui/react-icons'
 
 interface TestRuleInlineContentProps {
@@ -21,14 +22,26 @@ export function TestRuleInlineContent({ rule }: TestRuleInlineContentProps) {
  return <CustomCodeContent rule={rule} />
  case 'parameterization':
  case 'verification':
- return null
- case 'recording-verification':
- return null
+ return <VerificationContent />
  default:
  return exhaustive(rule)
  }
 }
 
+function VerificationContent() {
+ return (
+ <>
+ <Tooltip
+ content={`Checks will be added for status to be the same as the recording.`}
+ >
+ <Badge color="gray">
+ <DiscIcon /> Recording
+ </Badge>
+ </Tooltip>
+ </>
+ )
+}
+
 function CorrelationContent({ rule }: { rule: CorrelationRule }) {
  return (
  <>

src/views/Generator/TestRuleContainer/TestRule/TestRuleTypeBadge.tsx

@@ -36,8 +36,6 @@ function getLabel(rule: TestRule) {
  return 'Parameterization'
  case 'verification':
  return 'Verification'
- case 'recording-verification':
- return 'Recording Verification'
  default:
  return exhaustive(rule)
  }