projects
/
cs356-p2-videostore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Massive Cleanup
[cs356-p2-videostore.git]
/
test
/
functional
/
video_media_controller_test.rb
diff --git
a/test/functional/media_controller_test.rb
b/test/functional/video_media_controller_test.rb
similarity index 63%
rename from
test/functional/media_controller_test.rb
rename to
test/functional/video_media_controller_test.rb
index
b2824ad
..
fbec6fc
100644
(file)
--- a/
test/functional/media_controller_test.rb
+++ b/
test/functional/video_media_controller_test.rb
@@
-1,18
+1,18
@@
require File.dirname(__FILE__) + '/../test_helper'
require File.dirname(__FILE__) + '/../test_helper'
-require 'media_controller'
+require '
video_
media_controller'
# Re-raise errors caught by the controller.
# Re-raise errors caught by the controller.
-class MediaController; def rescue_action(e) raise e end; end
+class
Video
MediaController; def rescue_action(e) raise e end; end
-class MediaControllerTest < Test::Unit::TestCase
- fixtures :medias
+class
Video
MediaControllerTest < Test::Unit::TestCase
+ fixtures :
video_
medias
def setup
def setup
- @controller = MediaController.new
+ @controller =
Video
MediaController.new
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
- @first_id = medias(:first).id
+ @first_id =
video_
medias(:first).id
end
def test_index
end
def test_index
@@
-27,7
+27,7
@@
class MediaControllerTest < Test::Unit::TestCase
assert_response :success
assert_template 'list'
assert_response :success
assert_template 'list'
- assert_not_nil assigns(:medias)
+ assert_not_nil assigns(:
video_
medias)
end
def test_show
end
def test_show
@@
-36,8
+36,8
@@
class MediaControllerTest < Test::Unit::TestCase
assert_response :success
assert_template 'show'
assert_response :success
assert_template 'show'
- assert_not_nil assigns(:media)
- assert assigns(:media).valid?
+ assert_not_nil assigns(:
video_
media)
+ assert assigns(:
video_
media).valid?
end
def test_new
end
def test_new
@@
-46,18
+46,18
@@
class MediaControllerTest < Test::Unit::TestCase
assert_response :success
assert_template 'new'
assert_response :success
assert_template 'new'
- assert_not_nil assigns(:media)
+ assert_not_nil assigns(:
video_
media)
end
def test_create
end
def test_create
- num_
medias =
Media.count
+ num_
video_medias = Video
Media.count
- post :create, :media => {}
+ post :create, :
video_
media => {}
assert_response :redirect
assert_redirected_to :action => 'list'
assert_response :redirect
assert_redirected_to :action => 'list'
- assert_equal num_
medias + 1,
Media.count
+ assert_equal num_
video_medias + 1, Video
Media.count
end
def test_edit
end
def test_edit
@@
-66,8
+66,8
@@
class MediaControllerTest < Test::Unit::TestCase
assert_response :success
assert_template 'edit'
assert_response :success
assert_template 'edit'
- assert_not_nil assigns(:media)
- assert assigns(:media).valid?
+ assert_not_nil assigns(:
video_
media)
+ assert assigns(:
video_
media).valid?
end
def test_update
end
def test_update
@@
-78,7
+78,7
@@
class MediaControllerTest < Test::Unit::TestCase
def test_destroy
assert_nothing_raised {
def test_destroy
assert_nothing_raised {
- Media.find(@first_id)
+
Video
Media.find(@first_id)
}
post :destroy, :id => @first_id
}
post :destroy, :id => @first_id
@@
-86,7
+86,7
@@
class MediaControllerTest < Test::Unit::TestCase
assert_redirected_to :action => 'list'
assert_raise(ActiveRecord::RecordNotFound) {
assert_redirected_to :action => 'list'
assert_raise(ActiveRecord::RecordNotFound) {
- Media.find(@first_id)
+
Video
Media.find(@first_id)
}
end
end
}
end
end