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 629929a1c02b4d93c94bc0d120e15d9d270b2a23..a1f08ae6d6881f523bf578dbb3c7762103e65660 100644 (file)
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -1,43 +1,29 @@
-require 'test_helper'
+require "test_helper"

 
 class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
 
 class UserChangesetCommentsTest < ActionDispatch::IntegrationTest

-  fixtures :users, :changesets, :changeset_comments
-
-  # Test 'log in to comment' message for nonlogged in user
-  def test_log_in_message
-    get "/changeset/#{changesets(:normal_user_closed_change).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
   # Test if the form is shown
   def test_displaying_form

-    get_via_redirect '/login'
+    user = create(:user)
+    changeset = create(:changeset, :closed)
+
+    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' => "test@openstreetmap.org", 'password' => "test"}
+    post "/login", :params => { "username" => user.email, "password" => "test" }

     assert_response :redirect
 
     assert_response :redirect
 

-    get "/changeset/#{changesets(:normal_user_closed_change).id}"
+    get "/changeset/#{changeset.id}"

 
     assert_response :success
 
     assert_response :success

-    assert_template 'browse/changeset'
+    assert_template "browse/changeset"

 
     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