fix tests

fiduswriter · Feb 9, 2025 · 067b2ec · 067b2ec
1 parent c9ffe80
commit 067b2ec
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/fiduswriter/book/static/js/modules/books/actions.js b/fiduswriter/book/static/js/modules/books/actions.js
@@ -128,6 +128,9 @@ export class BookActions {
             return escapeText(longFilePath(book.title, book.path))
         })
         const buttons = [
+            {
+                type: "close"
+            },
             {
                 text: gettext("Delete"),
                 classes: "fw-dark",
@@ -137,9 +140,6 @@ export class BookActions {
                         this.bookOverview.initTable()
                     })
                 }
-            },
-            {
-                type: "close"
             }
         ]
 
@@ -175,6 +175,9 @@ export class BookActions {
         }
 
         const buttons = [
+            {
+                type: "cancel"
+            },
             {
                 text: gettext("Submit"),
                 classes: "fw-dark",
@@ -188,9 +191,6 @@ export class BookActions {
                         })
                     dialog.close()
                 }
-            },
-            {
-                type: "cancel"
             }
         ]
 

diff --git a/fiduswriter/book/static/js/modules/books/index.js b/fiduswriter/book/static/js/modules/books/index.js
@@ -214,6 +214,10 @@ export class BookOverview {
                 data: fileList
             },
             columns: [
+                {
+                    select: 0,
+                    type: "number"
+                },
                 {
                     select: hiddenCols,
                     hidden: true

diff --git a/fiduswriter/book/static/js/modules/books/menu.js b/fiduswriter/book/static/js/modules/books/menu.js
@@ -15,7 +15,7 @@ export const menuModel = () => ({
         {
             type: "text",
             title: gettext("Create new book"),
-            keys: "n",
+            keys: "Alt-n",
             action: overview => {
                 overview.getImageDB().then(() => {
                     overview.mod.actions.createBookDialog(0, overview.imageDB)
@@ -26,7 +26,7 @@ export const menuModel = () => ({
         {
             type: "text",
             title: gettext("Create new folder"),
-            keys: "o",
+            keys: "Alt-f",
             action: overview => {
                 const dialog = new NewFolderDialog(folderName => {
                     overview.path = overview.path + folderName + "/"

diff --git a/fiduswriter/book/tests/test_book.py b/fiduswriter/book/tests/test_book.py
@@ -159,7 +159,7 @@ def test_books(self):
         ).click()
         # Create a new book
         self.driver.find_element(
-            By.CSS_SELECTOR, 'button[title="Create new book"]'
+            By.CSS_SELECTOR, 'button[title="Create new book (Alt-n)"]'
         ).click()
         self.driver.find_element(By.ID, "book-title").send_keys("My book")
         self.driver.find_element(By.ID, "book-metadata-author").send_keys(
@@ -366,7 +366,11 @@ def test_books(self):
             ),
             0,
         )
+
+        # Edit title
         self.driver.find_element(By.CSS_SELECTOR, ".book-title").click()
+        # Move focus
+        self.driver.find_element(By.CSS_SELECTOR, ".fw-tablerow-title").click()
         self.driver.find_element(By.ID, "book-title").send_keys(" EXTRA")
         self.driver.find_element(
             By.CSS_SELECTOR, 'a[href="#optionTab1"]'
@@ -603,7 +607,7 @@ def test_path(self):
         # Create a new book
         WebDriverWait(self.driver, self.wait_time).until(
             EC.element_to_be_clickable(
-                (By.CSS_SELECTOR, 'button[title="Create new book"]')
+                (By.CSS_SELECTOR, 'button[title="Create new book (Alt-n)"]')
             )
         ).click()
         self.driver.find_element(By.CSS_SELECTOR, "#book-title").click()
@@ -626,7 +630,7 @@ def test_path(self):
         )
         # Create new folder 'Releases' and enter
         self.driver.find_element(
-            By.CSS_SELECTOR, 'button[title="Create new folder"]'
+            By.CSS_SELECTOR, 'button[title="Create new folder (Alt-f)"]'
         ).click()
         self.driver.find_element(By.CSS_SELECTOR, "#new-folder-name").click()
         self.driver.find_element(
@@ -649,7 +653,7 @@ def test_path(self):
         # Create second book inside of Releases folder
         WebDriverWait(self.driver, self.wait_time).until(
             EC.element_to_be_clickable(
-                (By.CSS_SELECTOR, 'button[title="Create new book"]')
+                (By.CSS_SELECTOR, 'button[title="Create new book (Alt-n)"]')
             )
         ).click()
         self.driver.find_element(By.CSS_SELECTOR, "#book-title").click()
@@ -949,7 +953,7 @@ def test_sanity_check(self):
         ).click()
         # Create a new book
         self.driver.find_element(
-            By.CSS_SELECTOR, 'button[title="Create new book"]'
+            By.CSS_SELECTOR, 'button[title="Create new book (Alt-n)"]'
         ).click()
         self.driver.find_element(By.ID, "book-title").send_keys("My book")
         self.driver.find_element(