summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2017-03-15 00:20:23 +0100
committerHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2017-03-15 00:20:23 +0100
commit692068ba05d1c4c53b2cb1ba081f9c33fa358b9a (patch)
treec4bbe2f62930ae3a4a4f265ae34e7cf5c0cf23fe /test/integration
parent5a14e7ac5661c5ad326ec41d94c193b0b8a72636 (diff)
downloadecs-692068ba05d1c4c53b2cb1ba081f9c33fa358b9a.tar.gz
ecs-692068ba05d1c4c53b2cb1ba081f9c33fa358b9a.zip
Adjust test code.
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/community_messages_test.rb2
-rw-r--r--test/integration/ressource_test.rb16
2 files changed, 9 insertions, 9 deletions
diff --git a/test/integration/community_messages_test.rb b/test/integration/community_messages_test.rb
index a40d799..ec9a502 100644
--- a/test/integration/community_messages_test.rb
+++ b/test/integration/community_messages_test.rb
@@ -18,7 +18,7 @@
require 'test_helper'
-class CommunityMessagesTest < ActionController::IntegrationTest
+class CommunityMessagesTest < ActionDispatch::IntegrationTest
fixtures :all
BODY_DATA = "hallole"
diff --git a/test/integration/ressource_test.rb b/test/integration/ressource_test.rb
index a24dae5..cd94cc4 100644
--- a/test/integration/ressource_test.rb
+++ b/test/integration/ressource_test.rb
@@ -18,7 +18,7 @@
require 'test_helper'
-class RessourceTest < ActionController::IntegrationTest
+class RessourceTest < ActionDispatch::IntegrationTest
fixtures :all
def setup
@@ -82,8 +82,8 @@ class RessourceTest < ActionController::IntegrationTest
post '/numlab/exercises', BODY_DATA, @headers
assert_response 201
location = URI.split(headers["Location"])[5][1..-1].sub(/[^\/]*\/(.*)/, '\1')
- logger.info('headers["Location"]: '+headers["Location"])
- logger.info('location: '+location)
+ Rails.logger.info('headers["Location"]: '+headers["Location"])
+ Rails.logger.info('location: '+location)
sender_headers
get '/numlab/exercises', nil, @headers
assert_response 200
@@ -97,8 +97,8 @@ class RessourceTest < ActionController::IntegrationTest
post '/numlab/exercises', BODY_DATA, @headers
assert_response 201
location = URI.split(headers["Location"])[5][1..-1].sub(/[^\/]*\/(.*)/, '\1')
- logger.info('headers["Location"]: '+headers["Location"])
- logger.info('location: '+location)
+ Rails.logger.info('headers["Location"]: '+headers["Location"])
+ Rails.logger.info('location: '+location)
sender_headers
assert !@participant.community_selfrouting
get '/numlab/exercises', nil, @headers
@@ -132,8 +132,8 @@ class RessourceTest < ActionController::IntegrationTest
post '/numlab/exercises', BODY_DATA, @headers
assert_response 201
location = URI.split(headers["Location"])[5][1..-1].sub(/[^\/]*\/(.*)/, '\1')
- logger.info('headers["Location"]: '+headers["Location"])
- logger.info('location: '+location)
+ Rails.logger.info('headers["Location"]: '+headers["Location"])
+ Rails.logger.info('location: '+location)
# 1.1
sender_headers
get '/numlab/exercises', nil, @headers
@@ -173,7 +173,7 @@ class RessourceTest < ActionController::IntegrationTest
# 1.5
sender_headers
post '/events/fifo', nil, @headers
- logger.info("response body:\n"+response.body)
+ Rails.logger.info("response body:\n"+response.body)
assert_response 200
assert_nil response.body.index(location)
sender_headers