diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-03-12 13:05:19 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-03-12 13:05:19 +0000 |
| commit | 37bff4c0154b57b35a3194a9b31a9422496b955b (patch) | |
| tree | 61592a6bb9d1d9fea378a6e4efa8fdf7d5525b8a /spec/controllers/user_controller_spec.rb | |
| parent | 8b49dc894066e452232cabd09333895487f86986 (diff) | |
| parent | 8acea24f98268fbb9b73b66b9e98a1788a3b30ac (diff) | |
Merge branch 'merged-bundler' into develop
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 |