Merge pull request #379 from blackcandy-org/modal-dismiss

Fix the modal dialog can not dismiss automatically

app/views/dialog/playlists/index.html.erb

@@ -10,7 +10,7 @@
     <%# And we need a way to save the referer_url as parmas, %>
     <%# so we can redirect to the referer_url later. %>
     <%= hidden_field_tag :referer_url, params[:referer_url] if native_app? %>
-    <%= turbo_frame_tag "turbo-dialog-playlists-page-#{@pagy.page}", class: "c-list", data: {action: "click->dialog#hide"}, target: "_top" do %>
+    <%= turbo_frame_tag "turbo-dialog-playlists-page-#{@pagy.page}", class: "c-list", target: "_top" do %>
       <%= render partial: "dialog/playlists/playlist", collection: @playlists %>
 
       <% if @pagy.next %>

app/views/layouts/application.html.erb

@@ -37,12 +37,10 @@
             <%= render "shared/mini_player" %>
           </footer>
         </div>
+        <%= turbo_frame_tag "turbo-dialog" %>
       </div>
     </div>
   <% end %>
-
-  <div id='js-overlay' class='c-overlay c-overlay--fixed c-overlay--blur u-display-none'></div>
-  <%= turbo_frame_tag "turbo-dialog" %>
 <% end %>
 
 <%= render template: "layouts/base" %>

test/system/album_test.rb

@@ -102,6 +102,6 @@ class AlbumSystemTest < ApplicationSystemTestCase
     first(:test_id, "album_song_menu").click
     click_on "Play Last"
 
-    assert_equal all(:test_id, "current_playlist_song_name").last.text, first(:test_id, "album_song_name").text
+    assert_equal first(:test_id, "album_song_name").text, all(:test_id, "current_playlist_song_name").last.text
   end
 end

test/system/playlist_test.rb

@@ -115,6 +115,6 @@ class PlaylistSystemTest < ApplicationSystemTestCase
     first(:test_id, "playlist_song_menu").click
     click_on "Play Last"
 
-    assert_equal all(:test_id, "current_playlist_song_name").last.text, playlists(:playlist1).songs.first.name
+    assert_equal playlists(:playlist1).songs.first.name, all(:test_id, "current_playlist_song_name").last.text
   end
 end

test/system/songs_test.rb

@@ -76,6 +76,6 @@ class SongsSystemTest < ApplicationSystemTestCase
 
     first(:test_id, "song_menu").click
     click_on "Play Last"
-    assert_equal all(:test_id, "current_playlist_song_name").last.text, first(:test_id, "song_name").text
+    assert_equal first(:test_id, "song_name").text, all(:test_id, "current_playlist_song_name").last.text
   end
 end