From 6f1f51194de6c2a395513cd501e1c3e86c72fec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Bucho=CC=88ster?=
 <tbuchoester.mmt-b2009@fh-salzburg.ac.at>
Date: Fri, 10 Jun 2011 02:18:55 +0200
Subject: [PATCH] clean up test files, removed dispensable helper/controller
 files

---
 app/controllers/sidebar_controller.rb                |  5 -----
 app/helpers/artist_helper.rb                         |  2 --
 app/helpers/charts_helper.rb                         |  2 --
 app/helpers/home_helper.rb                           |  2 --
 app/helpers/search_helper.rb                         |  2 --
 app/helpers/sidebar_helper.rb                        |  2 --
 app/helpers/tracks_helper.rb                         |  2 --
 app/views/devise/confirmations/new.html.erb          | 12 ------------
 .../devise/mailer/confirmation_instructions.html.erb |  5 -----
 .../mailer/reset_password_instructions.html.erb      |  8 --------
 app/views/devise/mailer/unlock_instructions.html.erb |  7 -------
 app/views/devise/unlocks/new.html.erb                | 12 ------------
 test/fixtures/playlists.yml                          |  4 ++--
 test/fixtures/playlists_tracks.yml                   |  8 ++++----
 test/fixtures/users.yml                              | 11 ++++++-----
 test/functional/charts_controller_test.rb            |  4 ----
 test/functional/sidebar_controller_test.rb           |  9 ---------
 test/functional/users_controller_test.rb             |  5 +++++
 test/unit/helpers/artist_helper_test.rb              |  4 ----
 test/unit/helpers/charts_helper_test.rb              |  4 ----
 test/unit/helpers/home_helper_test.rb                |  4 ----
 test/unit/helpers/search_helper_test.rb              |  4 ----
 test/unit/helpers/sidebar_helper_test.rb             |  4 ----
 test/unit/helpers/tracks_helper_test.rb              |  4 ----
 test/unit/helpers/users_helper_test.rb               |  4 ++++
 25 files changed, 21 insertions(+), 109 deletions(-)
 delete mode 100644 app/controllers/sidebar_controller.rb
 delete mode 100644 app/helpers/artist_helper.rb
 delete mode 100644 app/helpers/charts_helper.rb
 delete mode 100644 app/helpers/home_helper.rb
 delete mode 100644 app/helpers/search_helper.rb
 delete mode 100644 app/helpers/sidebar_helper.rb
 delete mode 100644 app/helpers/tracks_helper.rb
 delete mode 100644 app/views/devise/confirmations/new.html.erb
 delete mode 100644 app/views/devise/mailer/confirmation_instructions.html.erb
 delete mode 100644 app/views/devise/mailer/reset_password_instructions.html.erb
 delete mode 100644 app/views/devise/mailer/unlock_instructions.html.erb
 delete mode 100644 app/views/devise/unlocks/new.html.erb
 delete mode 100644 test/functional/sidebar_controller_test.rb
 create mode 100644 test/functional/users_controller_test.rb
 delete mode 100644 test/unit/helpers/artist_helper_test.rb
 delete mode 100644 test/unit/helpers/charts_helper_test.rb
 delete mode 100644 test/unit/helpers/home_helper_test.rb
 delete mode 100644 test/unit/helpers/search_helper_test.rb
 delete mode 100644 test/unit/helpers/sidebar_helper_test.rb
 delete mode 100644 test/unit/helpers/tracks_helper_test.rb
 create mode 100644 test/unit/helpers/users_helper_test.rb

diff --git a/app/controllers/sidebar_controller.rb b/app/controllers/sidebar_controller.rb
deleted file mode 100644
index 74e5639..0000000
--- a/app/controllers/sidebar_controller.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class SidebarController < ApplicationController
-  def index
-  end
-
-end
diff --git a/app/helpers/artist_helper.rb b/app/helpers/artist_helper.rb
deleted file mode 100644
index cfeb732..0000000
--- a/app/helpers/artist_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module ArtistHelper
-end
diff --git a/app/helpers/charts_helper.rb b/app/helpers/charts_helper.rb
deleted file mode 100644
index 77f7e50..0000000
--- a/app/helpers/charts_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module ChartsHelper
-end
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
deleted file mode 100644
index 23de56a..0000000
--- a/app/helpers/home_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module HomeHelper
-end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
deleted file mode 100644
index b3ce20a..0000000
--- a/app/helpers/search_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module SearchHelper
-end
diff --git a/app/helpers/sidebar_helper.rb b/app/helpers/sidebar_helper.rb
deleted file mode 100644
index c54154a..0000000
--- a/app/helpers/sidebar_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module SidebarHelper
-end
diff --git a/app/helpers/tracks_helper.rb b/app/helpers/tracks_helper.rb
deleted file mode 100644
index 4769c0f..0000000
--- a/app/helpers/tracks_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module TracksHelper
-end
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
deleted file mode 100644
index da93af2..0000000
--- a/app/views/devise/confirmations/new.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<h2>Resend confirmation instructions</h2>
-
-<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.submit "Resend confirmation instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
deleted file mode 100644
index a6ea8ca..0000000
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>Welcome <%= @resource.email %>!</p>
-
-<p>You can confirm your account through the link below:</p>
-
-<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
deleted file mode 100644
index ae9e888..0000000
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
-
-<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
-
-<p>If you didn't request this, please ignore this email.</p>
-<p>Your password won't change until you access the link above and create a new one.</p>
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
deleted file mode 100644
index 2263c21..0000000
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
-
-<p>Click the link below to unlock your account:</p>
-
-<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
deleted file mode 100644
index 905a393..0000000
--- a/app/views/devise/unlocks/new.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<h2>Resend unlock instructions</h2>
-
-<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.submit "Resend unlock instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
\ No newline at end of file
diff --git a/test/fixtures/playlists.yml b/test/fixtures/playlists.yml
index 1a344c8..e3da02b 100644
--- a/test/fixtures/playlists.yml
+++ b/test/fixtures/playlists.yml
@@ -2,8 +2,8 @@
 
 one:
   name: MyString
-  owner: 
+  user_id: 
 
 two:
   name: MyString
-  owner: 
+  user_id: 
diff --git a/test/fixtures/playlists_tracks.yml b/test/fixtures/playlists_tracks.yml
index 22d7508..55ea2f1 100644
--- a/test/fixtures/playlists_tracks.yml
+++ b/test/fixtures/playlists_tracks.yml
@@ -1,13 +1,13 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
 one:
-  playlist: 
-  track: 
+  playlist_id: 
+  track_id: 
   youtube_id: MyString
   position: 1
 
 two:
-  playlist: 
-  track: 
+  playlist_id: 
+  track_id: 
   youtube_id: MyString
   position: 1
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 2893341..28a2b91 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -4,8 +4,9 @@
 # model remove the '{}' from the fixture names and add the columns immediately
 # below each fixture, per the syntax in the comments below
 #
-one: {}
-# column: value
-#
-two: {}
-#  column: value
+one:
+  username: MyString1
+  email: bla@example.org
+two:
+  username: MyString2
+  email: bli@example.org
\ No newline at end of file
diff --git a/test/functional/charts_controller_test.rb b/test/functional/charts_controller_test.rb
index c3e98be..810ff58 100644
--- a/test/functional/charts_controller_test.rb
+++ b/test/functional/charts_controller_test.rb
@@ -1,9 +1,5 @@
 require 'test_helper'
 
 class ChartsControllerTest < ActionController::TestCase
-  test "should get index" do
-    get :index
-    assert_response :success
-  end
 
 end
diff --git a/test/functional/sidebar_controller_test.rb b/test/functional/sidebar_controller_test.rb
deleted file mode 100644
index 9e97a87..0000000
--- a/test/functional/sidebar_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class SidebarControllerTest < ActionController::TestCase
-  test "should get index" do
-    get :index
-    assert_response :success
-  end
-
-end
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
new file mode 100644
index 0000000..87d4874
--- /dev/null
+++ b/test/functional/users_controller_test.rb
@@ -0,0 +1,5 @@
+require 'test_helper'
+
+class UsersControllerTest < ActionController::TestCase
+
+end
diff --git a/test/unit/helpers/artist_helper_test.rb b/test/unit/helpers/artist_helper_test.rb
deleted file mode 100644
index 27502a1..0000000
--- a/test/unit/helpers/artist_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class ArtistHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/charts_helper_test.rb b/test/unit/helpers/charts_helper_test.rb
deleted file mode 100644
index c57d4ce..0000000
--- a/test/unit/helpers/charts_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class ChartsHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/home_helper_test.rb b/test/unit/helpers/home_helper_test.rb
deleted file mode 100644
index 4740a18..0000000
--- a/test/unit/helpers/home_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class HomeHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/search_helper_test.rb b/test/unit/helpers/search_helper_test.rb
deleted file mode 100644
index 3034163..0000000
--- a/test/unit/helpers/search_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class SearchHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/sidebar_helper_test.rb b/test/unit/helpers/sidebar_helper_test.rb
deleted file mode 100644
index 294516f..0000000
--- a/test/unit/helpers/sidebar_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class SidebarHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/tracks_helper_test.rb b/test/unit/helpers/tracks_helper_test.rb
deleted file mode 100644
index b7bd3c8..0000000
--- a/test/unit/helpers/tracks_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class TracksHelperTest < ActionView::TestCase
-end
diff --git a/test/unit/helpers/users_helper_test.rb b/test/unit/helpers/users_helper_test.rb
new file mode 100644
index 0000000..96af37a
--- /dev/null
+++ b/test/unit/helpers/users_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class UsersHelperTest < ActionView::TestCase
+end