Test notices of disabled changeset commenting

[rails.git] / test / integration / user_changeset_comments_test.rb

diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb
index bedb1c69f39a398313d08a4c1fcb3eccc7249088..a1f08ae6d6881f523bf578dbb3c7762103e65660 100644 (file)
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -1,35 +1,18 @@
 require "test_helper"
 
 class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
 require "test_helper"
 
 class UserChangesetCommentsTest < ActionDispatch::IntegrationTest

-  # Test 'log in to comment' message for nonlogged in user
-  def test_log_in_message
-    changeset = create(:changeset, :closed)
-
-    get "/changeset/#{changeset.id}"
-    assert_response :success
-
-    assert_select "div#content" do
-      assert_select "div#sidebar" do
-        assert_select "div#sidebar_content" do
-          assert_select "div.browse-section" do
-            assert_select "div.notice.hide_if_logged_in"
-          end
-        end
-      end
-    end
-  end
-

   # Test if the form is shown
   def test_displaying_form
     user = create(:user)
     changeset = create(:changeset, :closed)
 
   # Test if the form is shown
   def test_displaying_form
     user = create(:user)
     changeset = create(:changeset, :closed)
 

-    get_via_redirect "/login"
+    get "/login"
+    follow_redirect!

     # We should now be at the login page
     assert_response :success
     # We should now be at the login page
     assert_response :success

-    assert_template "user/login"
+    assert_template "sessions/new"

     # We can now login
     # We can now login

-    post "/login", "username" => user.email, "password" => "test"
+    post "/login", :params => { "username" => user.email, "password" => "test" }

     assert_response :redirect
 
     get "/changeset/#{changeset.id}"
     assert_response :redirect
 
     get "/changeset/#{changeset.id}"


@@ -40,7 +23,7 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
     assert_select "div#content" do
       assert_select "div#sidebar" do
         assert_select "div#sidebar_content" do
     assert_select "div#content" do
       assert_select "div#sidebar" do
         assert_select "div#sidebar_content" do

-          assert_select "div.browse-section" do
+          assert_select "div" do

             assert_select "form[action='#']" do
               assert_select "textarea[name=text]"
             end
             assert_select "form[action='#']" do
               assert_select "textarea[name=text]"
             end