Fix tests

package.json

@@ -21,7 +21,7 @@
     "test-lint": "standard"
   },
   "devDependencies": {
-    "chromedriver": "^125.0.3",
+    "chromedriver": "^128.0.3",
     "mocha": "^10.4.0",
     "parcel": "^2.12.0",
     "selenium-webdriver": "^4.21.0",

src/components/items/tile.js

@@ -75,7 +75,6 @@ export class Tile extends Item {
   }
 
   onTap (event) {
-    console.debug(this.coordinates.offset.toString(), this)
     this.items.forEach((item) => item.onTap(event))
   }
 
@@ -88,6 +87,7 @@ export class Tile extends Item {
   }
 
   onSelected (deselectedTile) {
+    console.debug(this.toString(), 'selected')
     this.selected = true
     this.group.bringToFront()
     this.#ui.hexagon.style = this.styles.selected
@@ -119,7 +119,7 @@ export class Tile extends Item {
   }
 
   toString () {
-    return this.coordinates.offset.toString()
+    return `[${this.type}:${this.coordinates.offset.toString()}]`
   }
 
   update () {

test/fixtures.js

@@ -50,7 +50,7 @@ class PuzzleFixture {
 
     this.elements.body = await this.driver.findElement(By.tagName('body'))
     this.elements.canvas = await this.driver.findElement(By.id('puzzle'))
-    this.elements.modifiers = await this.driver.findElement(By.id('modifiers-mutable'))
+    this.elements.modifiers = await this.driver.findElement(By.id('modifiers'))
   }
 
   async clickModifier (name, options = {}) {
@@ -81,14 +81,9 @@ class PuzzleFixture {
     return this.driver.wait(untilElementHasClass(this.elements.body, 'puzzle-solved'))
   }
 
-  async selectModifier (name) {
-    const origin = this.#getModifier(name)
-    await this.driver.actions({ async: true }).move({ origin }).press().pause(501).release().perform()
-  }
-
   async #getModifier (name) {
     await this.driver.wait(until.elementIsVisible(this.elements.modifiers))
-    return await this.driver.findElement(By.className(`modifier-${name}`))
+    return await this.driver.findElement(By.css(`.modifier-${name}:not(.disabled)`))
   }
 
   static baseUrl = 'http://localhost:1234'

test/puzzles/002.js

@@ -9,8 +9,11 @@ describe('Puzzle 002', function () {
   before(puzzle.before)
 
   it('should be solved', async function () {
+    await puzzle.clickTile(0, 0)
+    await puzzle.clickModifier('toggle')
+
     await puzzle.clickTile(2, 0)
-    await puzzle.clickModifier('rotate')
+    await puzzle.clickModifier('toggle')
 
     assert(await puzzle.isSolved())
   })

test/puzzles/003.js

@@ -9,11 +9,12 @@ describe('Puzzle 003', function () {
   before(puzzle.before)
 
   it('should be solved', async function () {
-    await puzzle.clickTile(2, 1)
-    await puzzle.selectModifier('rotate')
     await puzzle.clickTile(2, 0)
     await puzzle.clickModifier('rotate')
 
+    await puzzle.clickTile(0, 0)
+    await puzzle.clickModifier('rotate', { times: 3 })
+
     assert(await puzzle.isSolved())
   })
 })

test/puzzles/007.js

@@ -13,14 +13,10 @@ describe('Puzzle 007', function () {
     await puzzle.clickModifier('move')
     await puzzle.clickTile(1, 0)
 
-    await puzzle.clickTile(2, 2)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(2, 3)
     await puzzle.clickModifier('move')
     await puzzle.clickTile(1, 4)
 
-    await puzzle.clickTile(2, 3)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(1, 2)
     await puzzle.clickModifier('rotate')
     await puzzle.clickModifier('move')

test/puzzles/009.js

@@ -13,14 +13,10 @@ describe('Puzzle 009', function () {
     await puzzle.clickModifier('move')
     await puzzle.clickTile(0, 0)
 
-    await puzzle.clickTile(1, 1)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(1, 5)
     await puzzle.clickModifier('move')
     await puzzle.clickTile(2, 5)
 
-    await puzzle.clickTile(1, 5)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(1, 4)
     await puzzle.clickModifier('move')
     await puzzle.clickTile(0, 5)

test/puzzles/010.js

@@ -13,14 +13,10 @@ describe('Puzzle 010', function () {
     await puzzle.clickModifier('move')
     await puzzle.clickTile(2, 4)
 
-    await puzzle.clickTile(1, 1)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(1, 5)
     await puzzle.clickModifier('move')
     await puzzle.clickTile(0, 5)
 
-    await puzzle.clickTile(1, 5)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(1, 0)
     await puzzle.clickModifier('move')
     await puzzle.clickTile(2, 5)

test/puzzles/011.js

@@ -15,8 +15,6 @@ describe('Puzzle 011', function () {
     await puzzle.clickTile(2, 1)
     await puzzle.isNotMasked()
 
-    await puzzle.clickTile(1, 1)
-    await puzzle.selectModifier('rotate')
     await puzzle.clickTile(2, 0)
     await puzzle.clickModifier('rotate', { times: 3 })
 

test/puzzles/012.js

@@ -30,41 +30,29 @@ describe('Puzzle 012', function () {
     await puzzle.clickTile(4, 4)
     await puzzle.clickModifier('rotate', { times: 3 })
 
-    await puzzle.clickTile(3, 0)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(4, 1)
     await puzzle.clickModifier('move')
     await puzzle.clickTile(1, 4)
     await puzzle.isMasked()
     await puzzle.clickTile(3, 1)
 
-    await puzzle.clickTile(3, 6)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(4, 4)
     await puzzle.clickModifier('move')
     await puzzle.clickTile(1, 2)
     await puzzle.isMasked()
     await puzzle.clickTile(3, 5)
 
-    await puzzle.clickTile(4, 1)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(3, 2)
     await puzzle.clickModifier('move')
     await puzzle.clickTile(2, 2)
 
-    await puzzle.clickTile(4, 4)
-    await puzzle.selectModifier('move')
     await puzzle.clickTile(3, 4)
     await puzzle.clickModifier('move')
     await puzzle.clickTile(2, 3)
 
-    await puzzle.clickTile(4, 1)
-    await puzzle.selectModifier('rotate')
     await puzzle.clickTile(2, 0)
     await puzzle.clickModifier('rotate', { times: 2 })
 
-    await puzzle.clickTile(4, 4)
-    await puzzle.selectModifier('rotate')
     await puzzle.clickTile(2, 5)
     await puzzle.clickModifier('rotate', { times: 4 })