- with_terms_seen(true) do
- user = create(:user, :terms_seen => false)
-
- # try to log in
- get "/login"
- follow_redirect!
- assert_response :success
- assert_template "user/login"
- post "/login", :username => user.email, :password => "test", :referer => "/diary/new"
- assert_response :redirect
- # but now we need to look at the terms
- assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
-
- # check that if we go somewhere else now, it redirects
- # back to the terms page.
- get "/traces/mine"
- assert_redirected_to :controller => :user, :action => :terms, :referer => "/traces/mine"
- get "/traces/mine", :referer => "/diary/new"
- assert_redirected_to :controller => :user, :action => :terms, :referer => "/diary/new"
- end
- end
-
- private
-
- def auth_header(user, pass)
- { "HTTP_AUTHORIZATION" => format("Basic %s", Base64.encode64("#{user}:#{pass}")) }
- end
-
- def with_terms_seen(value)
- require_terms_seen = Object.send("remove_const", "REQUIRE_TERMS_SEEN")
- Object.const_set("REQUIRE_TERMS_SEEN", value)
-
- yield
-
- Object.send("remove_const", "REQUIRE_TERMS_SEEN")
- Object.const_set("REQUIRE_TERMS_SEEN", require_terms_seen)
+ user = create(:user, :terms_seen => false, :terms_agreed => nil)
+
+ # try to log in
+ get "/login"
+ follow_redirect!
+ assert_response :success
+ assert_template "sessions/new"
+ post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" }
+ # but now we need to look at the terms
+ assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"
+
+ # check that if we go somewhere else now, it redirects
+ # back to the terms page.
+ get "/traces/mine"
+ assert_redirected_to :controller => :users, :action => :terms, :referer => "/traces/mine"
+ get "/traces/mine", :params => { :referer => "/diary/new" }
+ assert_redirected_to :controller => :users, :action => :terms, :referer => "/diary/new"