Merge remote-tracking branch 'upstream/pull/5110'

diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb
index a65597fefc4b732b7a80e60af4fd0d46ed29228d..c4b595e9b931dc6ba5e79be030105f082433a3d3 100644 (file)
--- a/app/views/dashboards/show.html.erb
+++ b/app/views/dashboards/show.html.erb
@@ -27,7 +27,7 @@
     </div>
 
     <div class="col-md">
-      <h3><%= t ".my friends" %></h3>
+      <h2><%= t ".my friends" %></h2>
 
       <% if friends.empty? %>
         <%= t ".no friends" %>
@@ -38,14 +38,14 @@
             <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
           </ul>
         </nav>
-        <div id="friends-container">
+        <div>
           <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
         </div>
       <% end %>
 
       <hr>
 
-      <h3><%= t ".nearby users" %></h3>
+      <h2><%= t ".nearby users" %></h2>
 
       <% if nearby.empty? %>
         <%= t ".no nearby users" %>

diff --git a/app/views/diary_comments/_page.html.erb b/app/views/diary_comments/_page.html.erb
index 53472e3ea1854e4582db68e39194e1593e030db1..66e40cd805733223825fc3bd731cd4ac297bb481 100644 (file)
--- a/app/views/diary_comments/_page.html.erb
+++ b/app/views/diary_comments/_page.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <table class="table table-striped" width="100%">
     <thead>
       <tr>

diff --git a/app/views/diary_entries/_page.html.erb b/app/views/diary_entries/_page.html.erb
index 34f364ac4694a816d04dfd9d96ca21a00fbdde0e..f07db9b6c73c953f0172f28b202e3b4a2b6f8f6f 100644 (file)
--- a/app/views/diary_entries/_page.html.erb
+++ b/app/views/diary_entries/_page.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <h4><%= t ".recent_entries" %></h4>
 
   <%= render @entries %>

diff --git a/app/views/shared/_pagination.html.erb b/app/views/shared/_pagination.html.erb
index 67b69e8645f0134cd975b228598ed29a358f7961..c8eddcd379b9ca414d44f24b45ffdee99b0f901a 100644 (file)
--- a/app/views/shared/_pagination.html.erb
+++ b/app/views/shared/_pagination.html.erb
@@ -7,7 +7,7 @@
     <% end %>
     <% if newer_id -%>
       <li class="page-item d-flex">
-        <%= link_to newer_link_content, @params.merge(:before => nil, :after => newer_id), :class => link_class, :data => { "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
+        <%= link_to newer_link_content, @params.merge(:before => nil, :after => newer_id), :class => link_class, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
       </li>
     <% else -%>
       <li class="page-item d-flex disabled">
@@ -21,7 +21,7 @@
     <% end %>
     <% if older_id -%>
       <li class="page-item d-flex">
-        <%= link_to older_link_content, @params.merge(:before => older_id, :after => nil), :class => link_class, :data => { "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
+        <%= link_to older_link_content, @params.merge(:before => older_id, :after => nil), :class => link_class, :data => { "turbo" => true, "turbo-frame" => "pagination", "turbo-action" => "advance" } %>
       </li>
     <% else -%>
       <li class="page-item d-flex disabled">

diff --git a/app/views/traces/_page.html.erb b/app/views/traces/_page.html.erb
index 38cdc734188078e02069a61c113ee652c3331a8d..e1ce3fe48604a897b201f1beeb40837ad9a8b982 100644 (file)
--- a/app/views/traces/_page.html.erb
+++ b/app/views/traces/_page.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <%= render "shared/pagination",
              :newer_key => "traces.page.newer",
              :older_key => "traces.page.older",

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index 7f44b6bc33191feaa0680ce8ccdf87f67565f7d9..de6feafa1e4d6ee695cedd90741ee9a34f67520a 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <table id="block_list" class="table table-borderless table-striped table-sm">
     <thead>
       <tr>

diff --git a/app/views/users/_page.html.erb b/app/views/users/_page.html.erb
index 3307c7b111c108b566bbd9e4f974a2ce09d33253..8a58a29b7f0d0204cf0cd5f8479fc7815d6c26d8 100644 (file)
--- a/app/views/users/_page.html.erb
+++ b/app/views/users/_page.html.erb
@@ -1,4 +1,4 @@
-<turbo-frame id="pagination" target="_top">
+<turbo-frame id="pagination" target="_top" data-turbo="false">
   <%= form_tag do %>
     <div class="row">
       <div class="col">

diff --git a/test/controllers/dashboards_controller_test.rb b/test/controllers/dashboards_controller_test.rb
index 84f9610e5f3ac7a583a3ee6a513f3f3304585cb9..0adf58a9e4b4cb368c3758a074eba24c83d5541e 100644 (file)
--- a/test/controllers/dashboards_controller_test.rb
+++ b/test/controllers/dashboards_controller_test.rb
@@ -9,28 +9,4 @@ class DashboardsControllerTest < ActionDispatch::IntegrationTest
       { :controller => "dashboards", :action => "show" }
     )
   end
-
-  def test_show_no_friends
-    user = create(:user)
-    session_for(user)
-
-    get dashboard_path
-  end
-
-  def test_show_with_friends
-    user = create(:user, :home_lon => 1.1, :home_lat => 1.1)
-    friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2)
-    create(:friendship, :befriender => user, :befriendee => friend_user)
-    create(:changeset, :user => friend_user)
-    session_for(user)
-
-    get dashboard_path
-
-    # Friends should be visible as we're now logged in
-    assert_select "div#friends-container" do
-      assert_select "div" do
-        assert_select "a[href='/user/#{ERB::Util.u(friend_user.display_name)}']", :count => 1
-      end
-    end
-  end
 end

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index cff52cff25a24fc2ff3ccf251c3b533b6ba94ce5..4f4edf10b034a82ad562b995bbb5328ab6db0382 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -325,9 +325,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0
     end
 
-    # Friends shouldn't be visible as we're not logged in
-    assert_select "div#friends-container", :count => 0
-
     # Test a user who has been blocked
     blocked_user = create(:user)
     create(:user_block, :user => blocked_user)

diff --git a/test/system/dashboard_test.rb b/test/system/dashboard_test.rb
new file mode 100644 (file)
index 0000000..bc2e3b4
--- /dev/null
+++ b/test/system/dashboard_test.rb
@@ -0,0 +1,27 @@
+require "application_system_test_case"
+
+class DashboardSystemTest < ApplicationSystemTestCase
+  test "show no users if have no friends" do
+    user = create(:user)
+    sign_in_as(user)
+
+    visit dashboard_path
+    assert_text "You have not added any friends yet."
+  end
+
+  test "show users if have friends" do
+    user = create(:user, :home_lon => 1.1, :home_lat => 1.1)
+    friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2)
+    create(:friendship, :befriender => user, :befriendee => friend_user)
+    create(:changeset, :user => friend_user)
+    sign_in_as(user)
+
+    visit dashboard_path
+    assert_no_text "You have not added any friends yet."
+
+    friends_heading = find :element, "h2", :text => "My friends"
+    others_heading = find :element, "h2", :text => "Other nearby users"
+
+    assert_link friend_user.display_name, :below => friends_heading, :above => others_heading
+  end
+end