improve examples

vitalets · Jul 10, 2024 · fff6bcd · fff6bcd
1 parent 68e66ba
commit fff6bcd
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 16 deletions.
diff --git a/examples/basic/features/steps/fixtures.ts b/examples/basic/features/steps/fixtures.ts
@@ -0,0 +1,7 @@
+import { test as base, createBdd } from 'playwright-bdd';
+
+export const test = base.extend({
+  // add your fixtures here
+});
+
+export const { Given, When, Then } = createBdd(test);
diff --git a/examples/esm/steps/index.ts → examples/basic/features/steps/index.ts b/examples/esm/steps/index.ts → examples/basic/features/steps/index.ts
@@ -1,7 +1,5 @@
 import { expect } from '@playwright/test';
-import { createBdd } from 'playwright-bdd';
-
-const { Given, When, Then } = createBdd();
+import { Given, When, Then } from './fixtures';
 
 Given('I am on home page', async ({ page }) => {
   await page.goto('https://playwright.dev');

diff --git a/examples/basic/playwright.config.ts b/examples/basic/playwright.config.ts
@@ -4,14 +4,14 @@ import { defineBddConfig, cucumberReporter } from 'playwright-bdd';
 // before playwright-bdd v7
 const testDir = defineBddConfig({
   paths: ['features/*.feature'],
-  require: ['steps/*.ts'],
+  require: ['features/steps/*.ts'],
 });
 
 // since playwright-bdd v7
 /*
 const testDir = defineBddConfig({
-  features: './features',
-  steps: './steps',
+  features: 'features/*.feature',
+  steps: 'features/steps/*.ts',
 });
 */
 

diff --git a/examples/cucumber-style/steps/fixtures.ts → ...cucumber-style/features/steps/fixtures.ts b/examples/cucumber-style/steps/fixtures.ts → ...cucumber-style/features/steps/fixtures.ts
diff --git a/examples/cucumber-style/steps/index.ts → ...es/cucumber-style/features/steps/index.ts b/examples/cucumber-style/steps/index.ts → ...es/cucumber-style/features/steps/index.ts
diff --git a/examples/cucumber-style/steps/world.ts → ...es/cucumber-style/features/steps/world.ts b/examples/cucumber-style/steps/world.ts → ...es/cucumber-style/features/steps/world.ts
diff --git a/examples/cucumber-style/playwright.config.ts b/examples/cucumber-style/playwright.config.ts
@@ -4,15 +4,15 @@ import { defineBddConfig, cucumberReporter } from 'playwright-bdd';
 // before playwright-bdd v7
 const testDir = defineBddConfig({
   paths: ['features'],
-  require: ['steps/*.ts'],
-  importTestFrom: 'steps/fixtures.ts',
+  require: ['features/steps/*.ts'],
+  importTestFrom: 'features/steps/fixtures.ts',
 });
 
 // since playwright-bdd v7
 /*
 const testDir = defineBddConfig({
-  features: './features',
-  steps: './steps',
+  features: 'features',
+  steps: 'features/steps/*.ts',
 });
 */
 

diff --git a/examples/decorators/steps/AdminTodoPage.ts → ...ecorators/features/steps/AdminTodoPage.ts b/examples/decorators/steps/AdminTodoPage.ts → ...ecorators/features/steps/AdminTodoPage.ts
diff --git a/examples/decorators/steps/TodoPage.ts → ...les/decorators/features/steps/TodoPage.ts b/examples/decorators/steps/TodoPage.ts → ...les/decorators/features/steps/TodoPage.ts
diff --git a/examples/decorators/steps/fixtures.ts → ...les/decorators/features/steps/fixtures.ts b/examples/decorators/steps/fixtures.ts → ...les/decorators/features/steps/fixtures.ts
diff --git a/examples/decorators/playwright.config.ts b/examples/decorators/playwright.config.ts
@@ -3,15 +3,15 @@ import { defineBddConfig, cucumberReporter } from 'playwright-bdd';
 
 // before playwright-bdd v7
 const testDir = defineBddConfig({
-  importTestFrom: 'steps/fixtures.ts',
   paths: ['features'],
+  importTestFrom: 'features/steps/fixtures.ts',
 });
 
 // since playwright-bdd v7
 /*
 const testDir = defineBddConfig({
-  features: './features',
-  steps: './steps',
+  features: 'features',
+  steps: 'features/steps/*.ts',
 });
 */
 

diff --git a/examples/basic/steps/index.ts → examples/esm/features/steps/index.ts b/examples/basic/steps/index.ts → examples/esm/features/steps/index.ts
diff --git a/examples/esm/playwright.config.ts b/examples/esm/playwright.config.ts
@@ -4,14 +4,14 @@ import { defineBddConfig, cucumberReporter } from 'playwright-bdd';
 // before playwright-bdd v7
 const testDir = defineBddConfig({
   paths: ['features/*.feature'],
-  import: ['steps/*.ts'], // <- note 'import' instead of 'require'
+  import: ['features/steps/*.ts'], // <- note 'import' instead of 'require'
 });
 
 // since playwright-bdd v7
 /*
 const testDir = defineBddConfig({
-  features: './features',
-  steps: './steps',
+  features: 'features/*.feature',
+  steps: 'features/steps/*.ts',
 });
 */