Merge branch 'develop'

Author: myieye

docker-compose.yml

@@ -259,6 +259,10 @@ services:
       - REMEMBER_ME_SECRET=bogus-development-key
       - LANGUAGE_DEPOT_API_TOKEN=bogus-development-token
       - XDEBUG_MODE=develop,debug
+      - GOOGLE_CLIENT_ID=bogus-development-token
+      - GOOGLE_CLIENT_SECRET=bogus-development-token
+      - FACEBOOK_CLIENT_ID=bogus-development-token
+      - FACEBOOK_CLIENT_SECRET=bogus-development-token
     command: sh -c "/wait && apache2-foreground"
     extra_hosts:
       - "host.docker.internal:host-gateway"

next-app/src/routes/+page.svelte

@@ -186,9 +186,9 @@
 
 		<ul class='menu p-4 w-fit bg-base-100 text-base-content'>
 			<li class='menu-title grid grid-cols-3'>
-				<span on:click={ () => sort_items_by('name') } on:keydown={ () => sort_items_by('name') } class='cursor-pointer w-fit'>Name</span>
-				<span on:click={ () => sort_items_by('prop') } on:keydown={ () => sort_items_by('name') } class='cursor-pointer w-fit'>Prop</span>
-				<span on:click={ () => sort_items_by('number') } on:keydown={ () => sort_items_by('name') } class='cursor-pointer w-fit'>Number</span>
+				<button on:click={ () => sort_items_by('name') } class=w-fit>Name</button>
+				<button on:click={ () => sort_items_by('prop') } class=w-fit>Prop</button>
+				<button on:click={ () => sort_items_by('number') } class=w-fit>Number</button>
 			</li>
 
 			<hr class='mt-2 mb-4'>

test/e2e/pages/base-page.ts

@@ -28,7 +28,7 @@ export abstract class BasePage
     return this.page.url().startsWith(appUrl) && !!this.page.url().match(this.urlPattern);
   }
 
-  private readonly locators: Locator[];
+  protected readonly locators: Locator[];
   private readonly urlPattern = this.url.includes('#') ?
     new RegExp(`${this.url}`) : new RegExp(`${this.url}/?(#|$)`);
 

test/e2e/pages/editor.page.ts

@@ -109,7 +109,7 @@ export class EditorPage extends BasePage {
     super(page, `/app/lexicon/${project.id}`, page.locator('.words-container-title:visible, .no-entries:visible'));
   }
 
-  async goto(options?: EditorGotoOptions): Promise<this> {
+  override async goto(options?: EditorGotoOptions): Promise<this> {
     await super.goto(options);
     if (options?.entryId) {
       // Navigating from one entry to another via URL/goto doesn't cause angular to load the new entry
@@ -120,7 +120,7 @@ export class EditorPage extends BasePage {
     return this;
   }
 
-  async waitFor(): Promise<this> {
+  override async waitFor(): Promise<this> {
     await super.waitFor();
     if (await this.page.isVisible('[id^=entryId_]')) {
       await this.locator('.entry-card').waitFor();

test/e2e/pages/index.ts

@@ -15,3 +15,5 @@ export * from './site-admin.page';
 export * from './user-profile.page';
 export * from './home.page';
 export * from './terms-and-conditions.page';
+export * from './oauth-google.page';
+export * from './oauth-facebook.page';

test/e2e/pages/oauth-facebook.page.ts

@@ -0,0 +1,14 @@
+import { Page } from '@playwright/test';
+import { BasePage } from './base-page';
+
+export class OAuthFacebookPage extends BasePage {
+
+  override get isCurrentPage(): boolean {
+    return this.page.url().startsWith('https://www.facebook.com/');
+  }
+
+  constructor(page: Page) {
+    super(page, '/oauthcallback/facebook', page.locator('#facebook'));
+  }
+
+}

test/e2e/pages/oauth-google.page.ts

@@ -0,0 +1,14 @@
+import { Page } from '@playwright/test';
+import { BasePage } from './base-page';
+
+export class OAuthGooglePage extends BasePage {
+
+  override get isCurrentPage(): boolean {
+    return this.page.url().startsWith('https://accounts.google.com/');
+  }
+
+  constructor(page: Page) {
+    super(page, '/oauthcallback/google', page.locator(':text("Google will share your name"), :text("The OAuth client was not found.")'));
+  }
+
+}

test/e2e/pages/project-settings.page.ts

@@ -27,7 +27,7 @@ export class ProjectSettingsPage extends BasePage {
   }
 
   // navigate to project without UI
-  async goto(): Promise<this> {
+  override async goto(): Promise<this> {
     await super.goto();
     await this.page.getByLabel('Project Name').waitFor();
     return this;

test/e2e/pages/projects.page.ts

@@ -35,7 +35,7 @@ export class ProjectsPage extends BasePage {
     super(page, '/app/projects', page.locator('button:has-text("Start or Join a New Project")'));
   }
 
-  async goto(): Promise<this> {
+  override async goto(): Promise<this> {
     await super.goto();
     if (await this.projectsPerPageDropdown.isVisible()) {
       await this.projectsPerPageDropdown.selectOption('100');

test/e2e/pages/signup.page.ts

@@ -54,7 +54,7 @@ export class SignupPage extends BasePage {
     super(page, '/public/signup', page.locator('#email'));
   }
 
-  async goto(options?: SignupGotoOptions): Promise<this> {
+  override async goto(options?: SignupGotoOptions): Promise<this> {
     if (options?.email) {
       await this.page.goto(this.url + '#!/?e=' + encodeURIComponent(options?.email));
       await Promise.all([