fix specs?

ZogStriP · ZogStriP · commit f0bb6a2c21fb · 2025-05-28T10:35:58.000+02:00
diff --git a/app/assets/javascripts/discourse/app/components/time-shortcut-picker.gjs b/app/assets/javascripts/discourse/app/components/time-shortcut-picker.gjs
@@ -253,7 +253,8 @@ export default class TimeShortcutPicker extends Component {
         this.keyValueStore.lastCustomDate = this.customDate;
       }
     } else {
-      dateTime = this.options.findBy("id", type).timeFn();
+      const option = this.options.findBy("id", type);
+      dateTime = option?.timeFn?.();
     }
 
     this.setProperties({
@@ -262,7 +263,15 @@ export default class TimeShortcutPicker extends Component {
     });
 
     if (this.onTimeSelected) {
-      this.onTimeSelected(type, dateTime);
+      // Pass the type and either a function that returns the datetime, or a datetime value
+      if (type === TIME_SHORTCUT_TYPES.CUSTOM) {
+        // For custom datetimes, create a function that returns the datetime
+        this.onTimeSelected(type, () => dateTime);
+      } else {
+        // For preset options, pass the timeFn function directly
+        const option = this.options.findBy("id", type);
+        this.onTimeSelected(type, option?.timeFn || (() => dateTime));
+      }
     }
   }
 
diff --git a/spec/system/bookmarks_spec.rb b/spec/system/bookmarks_spec.rb
@@ -57,10 +57,18 @@ def open_bookmark_menu(post, expand_actions: true)
     visit_topic_and_open_bookmark_menu(post)
     bookmark_menu.click_menu_option("custom")
     bookmark_modal.select_preset_reminder(:tomorrow)
-    expect(topic_page).to have_post_bookmarked(post, with_reminder: true)
+
+    # Wait for the bookmark to be created with a reminder in the database
     try_until_success(frequency: 0.5) do
-      expect(Bookmark.find_by(bookmarkable: post, user: current_user).reminder_at).not_to be_blank
+      bookmark = Bookmark.find_by(bookmarkable: post, user: current_user)
+      expect(bookmark&.reminder_at).not_to be_blank
     end
+
+    # Reload the page to ensure we see the updated UI state
+    topic_page.visit_topic(topic)
+
+    # The bookmark should have a reminder icon
+    expect(topic_page).to have_post_bookmarked(post, with_reminder: true)
   end
 
   it "allows choosing a different auto_delete_preference to the user preference and remembers it when reopening the modal" do
diff --git a/spec/system/page_objects/modals/bookmark.rb b/spec/system/page_objects/modals/bookmark.rb
@@ -13,7 +13,8 @@ def name
 
       def select_preset_reminder(identifier)
         find("#tap_tile_#{identifier}").click
-        closed?
+        # Wait for modal to fully close
+        has_no_css?(".bookmark-reminder-modal", wait: 5) # Use standard Capybara wait
       end
 
       def has_active_preset?(identifier)

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,8 @@ export default class TimeShortcutPicker extends Component {`
`253`	`253`	`this.keyValueStore.lastCustomDate = this.customDate;`
`254`	`254`	`}`
`255`	`255`	`} else {`
`256`		`- dateTime = this.options.findBy("id", type).timeFn();`
	`256`	`+ const option = this.options.findBy("id", type);`
	`257`	`+ dateTime = option?.timeFn?.();`
`257`	`258`	`}`
`258`	`259`
`259`	`260`	`this.setProperties({`
`@@ -262,7 +263,15 @@ export default class TimeShortcutPicker extends Component {`
`262`	`263`	`});`
`263`	`264`
`264`	`265`	`if (this.onTimeSelected) {`
`265`		`- this.onTimeSelected(type, dateTime);`
	`266`	`+ // Pass the type and either a function that returns the datetime, or a datetime value`
	`267`	`+ if (type === TIME_SHORTCUT_TYPES.CUSTOM) {`
	`268`	`+ // For custom datetimes, create a function that returns the datetime`
	`269`	`+ this.onTimeSelected(type, () => dateTime);`
	`270`	`+ } else {`
	`271`	`+ // For preset options, pass the timeFn function directly`
	`272`	`+ const option = this.options.findBy("id", type);`
	`273`	`+ this.onTimeSelected(type, option?.timeFn \|\| (() => dateTime));`
	`274`	`+ }`
`266`	`275`	`}`
`267`	`276`	`}`
`268`	`277`