aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2012-06-22 03:49:43 +0200
committerHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2012-06-22 03:56:27 +0200
commit16c26fca39d2dde7a54d61840f3cdefdb3c45cb0 (patch)
treeeadbb6179e1bfcb5213d0b595fce782ad002bfcc /test
parent9be7b2fd21ee2383cd739d17c5e402833bb85ba6 (diff)
downloadecs2-16c26fca39d2dde7a54d61840f3cdefdb3c45cb0.tar.gz
ecs2-16c26fca39d2dde7a54d61840f3cdefdb3c45cb0.zip
New ECS configuration file introduced.
It's a YAML configuration file for global ECS functionality.
Diffstat (limited to 'test')
-rw-r--r--test/functional/memberships_controller_test.rb14
-rw-r--r--test/functional/messages_controller_test.rb2
2 files changed, 3 insertions, 13 deletions
diff --git a/test/functional/memberships_controller_test.rb b/test/functional/memberships_controller_test.rb
index 4902434..9612d60 100644
--- a/test/functional/memberships_controller_test.rb
+++ b/test/functional/memberships_controller_test.rb
@@ -19,20 +19,10 @@
require 'test_helper'
class MembershipsControllerTest < ActionController::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
- end
-
- test "create_anonymous_client" do
- @request.env["CONTENT_TYPE"] = "application/json"
- get :index
-
- assert_response 200
- assert_match /ecs_anonymous=.*/, @response.headers["Set-Cookie"].to_s
- end
test "prettyfied memberships" do
+ @request.env["X-EcsAuthId"] = identities(:ulm_id1).name
+ @request.set_REQUEST_URI("/sys/memberships")
@request.env["ACCEPT"] = "application/json"
get :index
assert_response 200
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index 62118ba..7c3e125 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -316,7 +316,7 @@ class MessagesControllerTest < ActionController::TestCase
assert_response 200
assert_match /ecs_anonymous=.*/, @response.headers["Set-Cookie"].to_s
assert_equal mm_count+1, MembershipMessage.all.count
- end
+ end if ECS_CONFIG["participants"]["allow_anonymous"]
end