Project

General

Profile

« Previous | Next » 

Revision feacea35

Added by Amos Benari about 11 years ago

  • ID feacea35f07f362d9e2c694a83516bbc902321a0

upgrade foreman to rails 3.2.13

This commit updates from rails 3.0.x to 3.2.x, main changes include:

  • Asset pipline support
  • cleanup of existing assets (javascript, css, images)

Users who uses foreman in production, make sure that you now compile
your assets, e.g

rake assets:precompile

Paired-with: Joseph Mitchell Magen <>
Paired-with: Ohad Levy <>

Signed-off-by: Ohad Levy <>

View differences:

test/functional/unattended_controller_test.rb
Setting[:foreman_url] = "test.host"
@request.env["REMOTE_ADDR"] = hosts(:ubuntu).ip
hosts(:ubuntu).create_token(:value => "aaaaaa", :expires => Time.now + 5.minutes)
template = get :preseed
get :preseed
expected = File.read(Pathname.new(__FILE__).parent.parent + "fixtures/sample_tokenised_template")
assert_equal template.body, expected
assert_equal expected, @response.body
end
test "template should not contain https when ssl enabled" do
@request.env["HTTPS"] = "on"
@request.env["REMOTE_ADDR"] = hosts(:ubuntu).ip
template = get :preseed
get :preseed
expected = File.read(Pathname.new(__FILE__).parent.parent + "fixtures/sample_http_preseed_template")
assert_equal template.body, expected
# @response.body contains <head> and page header and footer and expected do not, which caused the test to fail if assert_equal
assert_equal expected, @response.body
end
end

Also available in: Unified diff