diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-04-19 11:09:41 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-04-19 11:09:41 +0100 |
| commit | 69be0151757f1802052b9895135d3047605e6338 (patch) | |
| tree | aaeab66bb26e21bbd582b243233db60f1a855f5d /spec/controllers/user_controller_spec.rb | |
| parent | 17d8dad044dea0fc678d0bdc409700131685db86 (diff) | |
| parent | a33c560ab2a3a6c1090dc0334b85c46b9f45c107 (diff) | |
Merge branch 'develop' into purge-requests
Conflicts:
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 40649b6e1..0d7b19e1e 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -1,8 +1,6 @@ # coding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') -require 'json' - # XXX Use route_for or params_from to check /c/ links better # http://rspec.rubyforge.org/rspec-rails/1.1.12/classes/Spec/Rails/Example/ControllerExampleGroup.html |