github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 19:14:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: fix flakeyness with drawer specs (#22476)

Browse Source 
Chat drawer was using the `DiscourseURL` hook `afterRouteComplete`. This hook suffer from a very poor implementation which makes it very unreliable:

```javascript
if (typeof opts.afterRouteComplete === "function") {
  schedule("afterRender", opts.afterRouteComplete);
}
```

This commit attempts to return the promise from `handleURL` to directly use it and have a very reliable after transition hook.
This commit is contained in:
Joffrey JAFFEUX
2023-07-07 00:46:04 +02:00
committed by GitHub
parent a032a675c4
commit f0d82de5d9
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/chat/assets/javascripts/discourse/components/chat-channel.js
View File

@ -825,13 +825,8 @@ export default class ChatLivePane extends Component {
onCloseFullScreen() {
this.chatStateManager.prefersDrawer();
DiscourseURL.routeTo(this.chatStateManager.lastKnownAppURL, {
afterRouteComplete: () => {
this.appEvents.trigger(
"chat:open-url",
this.chatStateManager.lastKnownChatURL
);
},
DiscourseURL.routeTo(this.chatStateManager.lastKnownAppURL).then(() => {
DiscourseURL.routeTo(this.chatStateManager.lastKnownChatURL);
});
}

2
plugins/chat/spec/system/navigation_spec.rb
View File

@ -120,7 +120,7 @@ RSpec.describe "Navigation", type: :system do
end
context "when collapsing full page with previous state" do
xit "redirects to previous state" do
it "redirects to previous state" do
visit("/t/-/#{topic.id}")
chat_page.open_from_header
chat_drawer_page.maximize