aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/track_controller_spec.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-03-12 13:05:19 +0000
committerSeb Bacon <seb.bacon@gmail.com>2012-03-12 13:05:19 +0000
commit37bff4c0154b57b35a3194a9b31a9422496b955b (patch)
tree61592a6bb9d1d9fea378a6e4efa8fdf7d5525b8a /spec/controllers/track_controller_spec.rb
parent8b49dc894066e452232cabd09333895487f86986 (diff)
parent8acea24f98268fbb9b73b66b9e98a1788a3b30ac (diff)
Merge branch 'merged-bundler' into develop
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
-rw-r--r--spec/controllers/track_controller_spec.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb
index 0dc5db607..2ebf0109a 100644
--- a/spec/controllers/track_controller_spec.rb
+++ b/spec/controllers/track_controller_spec.rb
@@ -1,7 +1,5 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'json'
-
describe TrackController, "when making a new track on a request" do
before do
@ir = mock_model(InfoRequest, :url_title => 'myrequest',