@nextsparkjs/theme-crm 0.1.0-beta.37 → 0.1.0-beta.39

package/lib/selectors.ts

@@ -9,8 +9,7 @@
  * - Cypress tests (via tests/cypress/src/selectors.ts)
  */
 
-import { createSelectorHelpers } from '@nextsparkjs/core/lib/test/selector-factory'
-import { CORE_SELECTORS } from '@nextsparkjs/core/lib/test/core-selectors'
+import { createSelectorHelpers, CORE_SELECTORS } from '@nextsparkjs/testing/selectors'
 
 // =============================================================================
 // BLOCK SELECTORS
@@ -329,5 +328,5 @@ export type ThemeSelectorsType = typeof THEME_SELECTORS
 export type BlockSelectorsType = typeof BLOCK_SELECTORS
 export type EntitySelectorsType = typeof ENTITY_SELECTORS
 export type CRMSelectorsType = typeof CRM_SELECTORS
-export type { Replacements } from '@nextsparkjs/core/lib/test/selector-factory'
+export type { Replacements } from '@nextsparkjs/testing/selectors'
 export { CORE_SELECTORS }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextsparkjs/theme-crm",
-  "version": "0.1.0-beta.37",
+  "version": "0.1.0-beta.39",
   "private": false,
   "type": "module",
   "main": "./config/theme.config.ts",
@@ -13,7 +13,8 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "zod": "^4.0.0",
-    "@nextsparkjs/core": "0.1.0-beta.37"
+    "@nextsparkjs/core": "0.1.0-beta.39",
+    "@nextsparkjs/testing": "0.1.0-beta.39"
   },
   "nextspark": {
     "type": "theme",

package/tests/cypress/src/session-helpers.ts

@@ -2,11 +2,9 @@
  * CRM Theme Session Helpers
  *
  * Direct login functions for CRM theme tests using CRM-specific users.
- * These helpers don't depend on ACTIVE_THEME environment variable.
+ * Uses API-based login for faster and more stable authentication.
  */
 
-import { DevKeyring } from '../../../../../../test/cypress/src/classes/components/auth/DevKeyring.js'
-
 /**
  * CRM Test Users - hardcoded for CRM theme tests
  */
@@ -17,21 +15,85 @@ export const CRM_USERS = {
   LAURA: 'crm_member_laura@nextspark.dev',    // Marketing
 } as const
 
+// Default test password
+const TEST_PASSWORD = Cypress.env('TEST_PASSWORD') || 'Test1234'
+const API_TIMEOUT = 60000
+
+/**
+ * API login helper
+ */
+function apiLogin(email: string, password: string = TEST_PASSWORD): Cypress.Chainable<boolean> {
+  return cy.request({
+    method: 'POST',
+    url: '/api/auth/sign-in/email',
+    body: { email, password },
+    timeout: API_TIMEOUT,
+    failOnStatusCode: false
+  }).then((response) => {
+    if (response.status === 200) {
+      return true
+    } else {
+      cy.log(`⚠️ API login failed with status ${response.status}`)
+      return false
+    }
+  })
+}
+
+/**
+ * Setup team context after login
+ */
+function setupTeamContext(preferredRole?: string) {
+  cy.request({
+    method: 'GET',
+    url: '/api/v1/teams',
+    timeout: API_TIMEOUT,
+    failOnStatusCode: false
+  }).then((teamsResponse) => {
+    if (teamsResponse.status === 200 && teamsResponse.body?.data?.length > 0) {
+      const teams = teamsResponse.body.data
+      let selectedTeam = teams[0]
+      if (preferredRole) {
+        const teamWithRole = teams.find((t: { role: string }) => t.role === preferredRole)
+        if (teamWithRole) {
+          selectedTeam = teamWithRole
+        }
+      }
+      const teamId = selectedTeam.id
+      cy.log(`✅ Setting active team: ${selectedTeam.name} (${teamId})`)
+      cy.window().then((win) => {
+        win.localStorage.setItem('activeTeamId', teamId)
+      })
+      cy.request({
+        method: 'POST',
+        url: '/api/v1/teams/switch',
+        body: { teamId },
+        timeout: API_TIMEOUT,
+        failOnStatusCode: false
+      })
+    }
+  })
+}
+
 /**
  * Login as CRM Owner (CEO)
  * Session is cached and reused across tests
  */
 export function loginAsCrmOwner() {
   cy.session('crm-owner-session', () => {
-    cy.visit('/login')
-    const devKeyring = new DevKeyring()
-    devKeyring.validateVisible()
-    devKeyring.quickLoginByEmail(CRM_USERS.OWNER)
-    cy.url().should('include', '/dashboard')
+    apiLogin(CRM_USERS.OWNER).then((success) => {
+      if (success) {
+        cy.visit('/dashboard', { timeout: 60000 })
+      }
+      cy.url().should('include', '/dashboard')
+      setupTeamContext()
+    })
   }, {
     validate: () => {
-      cy.visit('/dashboard')
-      cy.url().should('include', '/dashboard')
+      cy.request({
+        url: '/api/auth/get-session',
+        timeout: API_TIMEOUT,
+        failOnStatusCode: false
+      }).its('status').should('eq', 200)
     }
   })
 }
@@ -42,15 +104,20 @@ export function loginAsCrmOwner() {
  */
 export function loginAsCrmAdmin() {
   cy.session('crm-admin-session', () => {
-    cy.visit('/login')
-    const devKeyring = new DevKeyring()
-    devKeyring.validateVisible()
-    devKeyring.quickLoginByEmail(CRM_USERS.ADMIN)
-    cy.url().should('include', '/dashboard')
+    apiLogin(CRM_USERS.ADMIN).then((success) => {
+      if (success) {
+        cy.visit('/dashboard', { timeout: 60000 })
+      }
+      cy.url().should('include', '/dashboard')
+      setupTeamContext()
+    })
   }, {
     validate: () => {
-      cy.visit('/dashboard')
-      cy.url().should('include', '/dashboard')
+      cy.request({
+        url: '/api/auth/get-session',
+        timeout: API_TIMEOUT,
+        failOnStatusCode: false
+      }).its('status').should('eq', 200)
     }
   })
 }
@@ -61,15 +128,20 @@ export function loginAsCrmAdmin() {
  */
 export function loginAsCrmMember() {
   cy.session('crm-member-session', () => {
-    cy.visit('/login')
-    const devKeyring = new DevKeyring()
-    devKeyring.validateVisible()
-    devKeyring.quickLoginByEmail(CRM_USERS.MEMBER)
-    cy.url().should('include', '/dashboard')
+    apiLogin(CRM_USERS.MEMBER).then((success) => {
+      if (success) {
+        cy.visit('/dashboard', { timeout: 60000 })
+      }
+      cy.url().should('include', '/dashboard')
+      setupTeamContext('member')
+    })
   }, {
     validate: () => {
-      cy.visit('/dashboard')
-      cy.url().should('include', '/dashboard')
+      cy.request({
+        url: '/api/auth/get-session',
+        timeout: API_TIMEOUT,
+        failOnStatusCode: false
+      }).its('status').should('eq', 200)
     }
   })
 }
@@ -80,15 +152,25 @@ export function loginAsCrmMember() {
  */
 export function loginAsCrmLaura() {
   cy.session('crm-laura-session', () => {
-    cy.visit('/login')
-    const devKeyring = new DevKeyring()
-    devKeyring.validateVisible()
-    devKeyring.quickLoginByEmail(CRM_USERS.LAURA)
-    cy.url().should('include', '/dashboard')
+    apiLogin(CRM_USERS.LAURA).then((success) => {
+      if (success) {
+        cy.visit('/dashboard', { timeout: 60000 })
+      }
+      cy.url().should('include', '/dashboard')
+      setupTeamContext('member')
+    })
   }, {
     validate: () => {
-      cy.visit('/dashboard')
-      cy.url().should('include', '/dashboard')
+      cy.request({
+        url: '/api/auth/get-session',
+        timeout: API_TIMEOUT,
+        failOnStatusCode: false
+      }).its('status').should('eq', 200)
     }
   })
 }
+
+// Aliases for convenience
+export const loginAsOwner = loginAsCrmOwner
+export const loginAsAdmin = loginAsCrmAdmin
+export const loginAsMember = loginAsCrmMember

package/tests/cypress.config.ts

@@ -8,20 +8,14 @@
 import { defineConfig } from 'cypress'
 import path from 'path'
 import fs from 'fs'
-import { fileURLToPath } from 'url'
 
-// ESM-compatible __dirname
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
+// __dirname works natively with CommonJS module resolution (tsconfig.cypress.json)
 
 // Paths relative to this config file
 const themeRoot = path.resolve(__dirname, '..')
 const projectRoot = path.resolve(__dirname, '../../../..')
 const narrationsOutputDir = path.join(__dirname, 'cypress/videos/narrations')
 
-// Detect if running in npm mode (no packages/core folder) vs monorepo
-const isNpmMode = !fs.existsSync(path.join(projectRoot, 'packages/core'))
-
 // Load environment variables
 import dotenv from 'dotenv'
 dotenv.config({ path: path.join(projectRoot, '.env') })
@@ -34,22 +28,13 @@ export default defineConfig({
     // Base URL for the application
     baseUrl: `http://localhost:${port}`,
 
-    // Spec patterns: theme tests (core tests only in monorepo)
-    specPattern: isNpmMode
-      ? [
-          // npm mode: only theme tests
-          path.join(__dirname, 'cypress/e2e/**/*.cy.{js,ts}'),
-        ]
-      : [
-          // Monorepo: core tests + theme tests
-          path.join(projectRoot, 'packages/core/tests/cypress/e2e/core/**/*.cy.{js,ts}'),
-          path.join(__dirname, 'cypress/e2e/**/*.cy.{js,ts}'),
-        ],
-
-    // Support file (theme-local in npm mode, core in monorepo)
-    supportFile: isNpmMode
-      ? path.join(__dirname, 'cypress/support/e2e.ts')
-      : path.join(projectRoot, 'packages/core/tests/cypress/support/e2e.ts'),
+    // Spec patterns: theme tests only
+    specPattern: [
+      path.join(__dirname, 'cypress/e2e/**/*.cy.{js,ts}'),
+    ],
+
+    // Support file (always theme-local)
+    supportFile: path.join(__dirname, 'cypress/support/e2e.ts'),
 
     // Fixtures folder (theme-specific)
     fixturesFolder: path.join(__dirname, 'cypress/fixtures'),