Fix more rubocop style issues

This commit is contained in:
Tom Hughes 2015-02-24 20:45:55 +00:00
parent 16da03aacb
commit a6b84a0294
24 changed files with 50 additions and 77 deletions

View file

@ -1381,7 +1381,7 @@ EOF
assert_response :success
assert_template nil
# print @response.body
# FIXME needs more assert_select tests
# FIXME: needs more assert_select tests
assert_select "osmChange[version='#{API_VERSION}'][generator='#{GENERATOR}']" do
assert_select "create", :count => 5
assert_select "create>node[id='#{nodes(:used_node_2).node_id}'][visible='#{nodes(:used_node_2).visible?}'][version='#{nodes(:used_node_2).version}']" do
@ -1393,7 +1393,7 @@ EOF
##
# check that the bounding box of a changeset gets updated correctly
## FIXME: This should really be moded to a integration test due to the with_controller
# FIXME: This should really be moded to a integration test due to the with_controller
def test_changeset_bbox
basic_authorization users(:public_user).email, "test"
@ -1769,7 +1769,7 @@ EOF
# Now check that all 20 (or however many were returned) changesets are in the html
assert_select "li", :count => changesets.size
changesets.each do |_changeset|
# FIXME this test needs rewriting - test for table contents
# FIXME: this test needs rewriting - test for table contents
end
end
@ -1795,7 +1795,7 @@ EOF
# Now check that all 20 (or however many were returned) changesets are in the html
assert_select "li", :count => changesets.size
changesets.each do |_changeset|
# FIXME this test needs rewriting - test for table contents
# FIXME: this test needs rewriting - test for table contents
end
end
@ -1806,7 +1806,7 @@ EOF
get :list, :format => "html", :display_name => user.display_name
assert_response :success
assert_template "history"
## FIXME need to add more checks to see which if edits are actually shown if your data is public
# FIXME: need to add more checks to see which if edits are actually shown if your data is public
end
##
@ -1829,7 +1829,7 @@ EOF
assert_select "feed", :count => 1
assert_select "entry", :count => changesets.size
changesets.each do |_changeset|
# FIXME this test needs rewriting - test for feed contents
# FIXME: this test needs rewriting - test for feed contents
end
end
@ -1841,7 +1841,7 @@ EOF
assert_response :success
assert_template "list"
assert_equal "application/atom+xml", response.content_type
## FIXME need to add more checks to see which if edits are actually shown if your data is public
# FIXME: need to add more checks to see which if edits are actually shown if your data is public
end
##

View file

@ -499,14 +499,6 @@ class NodeControllerTest < ActionController::TestCase
assert apinode.tags.include?("\#{@user.inspect}")
end
def basic_authorization(user, pass)
@request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
end
def content(c)
@request.env["RAW_POST_DATA"] = c.to_s
end
##
# update the changeset_id of a node element
def update_changeset(xml, changeset_id)

View file

@ -31,7 +31,7 @@ class OldNodeControllerTest < ActionController::TestCase
# matching versions of the object.
#
##
# FIXME Move this test to being an integration test since it spans multiple controllers
# FIXME: Move this test to being an integration test since it spans multiple controllers
def test_version
## First try this with a non-public user
basic_authorization(users(:normal_user).email, "test")

View file

@ -107,7 +107,7 @@ class RelationControllerTest < ActionController::TestCase
# check the "full" mode
get :full, :id => current_relations(:visible_relation).id
assert_response :success
# FIXME check whether this contains the stuff we want!
# FIXME: check whether this contains the stuff we want!
print @response.body if $VERBOSE
end