Merge remote-tracking branch 'openstreetmap/pull/1484'

[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 c984149dbcb8fa169dc4937e37ccef963e820595..5dbcaa0b413bea1ce52f5a94a10dfef7cc8c5162 100644 (file)
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -1,13 +1,13 @@
-require 'test_helper'
+require "test_helper"

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

-  fixtures :users, :changesets, :changeset_comments
+  fixtures :users, :changesets

 
   # 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
 
   # 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#content" do
       assert_select "div#sidebar" do
         assert_select "div#sidebar_content" do


@@ -21,18 +21,18 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
 
   # Test if the form is shown
   def test_displaying_form
 
   # Test if the form is shown
   def test_displaying_form

-    get_via_redirect '/login'
+    get_via_redirect "/login"

     # 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 "user/login"

     # We can now login
     # We can now login

-    post  '/login', {'username' => "test@openstreetmap.org", 'password' => "test"}
+    post "/login", "username" => "test@openstreetmap.org", "password" => "test"

     assert_response :redirect
 
     get "/changeset/#{changesets(:normal_user_closed_change).id}"
     assert_response :redirect
 
     get "/changeset/#{changesets(:normal_user_closed_change).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#content" do
       assert_select "div#sidebar" do