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

[rails.git] / test / controllers / dashboards_controller_test.rb

diff --git a/test/controllers/dashboards_controller_test.rb b/test/controllers/dashboards_controller_test.rb
index 5073df8cc1ab8d6b1d32b1a447da3bbc1ee4d287..0adf58a9e4b4cb368c3758a074eba24c83d5541e 100644 (file)
--- a/test/controllers/dashboards_controller_test.rb
+++ b/test/controllers/dashboards_controller_test.rb
@@ -9,26 +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.contact-activity", :count => 1
-    end
-  end
 end