</div>
<div class="col-md">
- <h3><%= t ".my friends" %></h3>
+ <h2><%= t ".my friends" %></h2>
<% if friends.empty? %>
<%= t ".no friends" %>
<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" %>
{ :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
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)
--- /dev/null
+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