Massive Cleanup

[cs356-p2-videostore.git] / test / functional / video_genre_controller_test.rb

diff --git a/test/functional/videogenre_controller_test.rb b/test/functional/video_genre_controller_test.rb
similarity index 63%
rename from test/functional/videogenre_controller_test.rb
rename to test/functional/video_genre_controller_test.rb
index 2186b18..fa307fc 100644 (file)
--- a/test/functional/videogenre_controller_test.rb
+++ b/test/functional/video_genre_controller_test.rb
@@ -1,18 +1,18 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'videogenre_controller'
+require 'video_genre_controller'
 
 # Re-raise errors caught by the controller.
-class VideogenreController; def rescue_action(e) raise e end; end
+class VideoGenreController; def rescue_action(e) raise e end; end
 
-class VideogenreControllerTest < Test::Unit::TestCase
-  fixtures :videogenres
+class VideoGenreControllerTest < Test::Unit::TestCase
+  fixtures :video_genres
 
   def setup
-    @controller = VideogenreController.new
+    @controller = VideoGenreController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
 
-    @first_id = videogenres(:first).id
+    @first_id = video_genres(:first).id
   end
 
   def test_index
@@ -27,7 +27,7 @@ class VideogenreControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'list'
 
-    assert_not_nil assigns(:videogenres)
+    assert_not_nil assigns(:video_genres)
   end
 
   def test_show
@@ -36,8 +36,8 @@ class VideogenreControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'show'
 
-    assert_not_nil assigns(:videogenre)
-    assert assigns(:videogenre).valid?
+    assert_not_nil assigns(:video_genre)
+    assert assigns(:video_genre).valid?
   end
 
   def test_new
@@ -46,18 +46,18 @@ class VideogenreControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'new'
 
-    assert_not_nil assigns(:videogenre)
+    assert_not_nil assigns(:video_genre)
   end
 
   def test_create
-    num_videogenres = Videogenre.count
+    num_video_genres = VideoGenre.count
 
-    post :create, :videogenre => {}
+    post :create, :video_genre => {}
 
     assert_response :redirect
     assert_redirected_to :action => 'list'
 
-    assert_equal num_videogenres + 1, Videogenre.count
+    assert_equal num_video_genres + 1, VideoGenre.count
   end
 
   def test_edit
@@ -66,8 +66,8 @@ class VideogenreControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'edit'
 
-    assert_not_nil assigns(:videogenre)
-    assert assigns(:videogenre).valid?
+    assert_not_nil assigns(:video_genre)
+    assert assigns(:video_genre).valid?
   end
 
   def test_update
@@ -78,7 +78,7 @@ class VideogenreControllerTest < Test::Unit::TestCase
 
   def test_destroy
     assert_nothing_raised {
-      Videogenre.find(@first_id)
+      VideoGenre.find(@first_id)
     }
 
     post :destroy, :id => @first_id
@@ -86,7 +86,7 @@ class VideogenreControllerTest < Test::Unit::TestCase
     assert_redirected_to :action => 'list'
 
     assert_raise(ActiveRecord::RecordNotFound) {
-      Videogenre.find(@first_id)
+      VideoGenre.find(@first_id)
     }
   end
 end