diff --git a/db/migrate/20100219230537_create_dmails.rb b/db/migrate/20100219230537_create_dmails.rb
index f0fc4c8da..d41c06c3f 100644
--- a/db/migrate/20100219230537_create_dmails.rb
+++ b/db/migrate/20100219230537_create_dmails.rb
@@ -4,7 +4,6 @@ class CreateDmails < ActiveRecord::Migration
t.column :owner_id, :integer, :null => false
t.column :from_id, :integer, :null => false
t.column :to_id, :integer, :null => false
- t.column :parent_id, :integer
t.column :title, :string, :null => false
t.column :body, :text, :null => false
t.column :message_index, "tsvector", :null => false
@@ -14,7 +13,6 @@ class CreateDmails < ActiveRecord::Migration
end
add_index :dmails, :owner_id
- add_index :dmails, :parent_id
execute "CREATE INDEX index_dmails_on_message_index ON dmails USING GIN (message_index)"
execute "CREATE TRIGGER trigger_dmails_on_update BEFORE INSERT OR UPDATE ON dmails FOR EACH ROW EXECUTE PROCEDURE tsvector_update_trigger('message_index', 'pg_catalog.english', 'title', 'body')"
diff --git a/test/factories/dmail.rb b/test/factories/dmail.rb
index f49f4444c..71f480029 100644
--- a/test/factories/dmail.rb
+++ b/test/factories/dmail.rb
@@ -1,8 +1,6 @@
Factory.define(:dmail) do |f|
- f.owner {|x| x.association(:user)}
- f.from_id {|x| x.owner_id}
f.to {|x| x.association(:user)}
- f.title {Faker::Lorem.words}
- f.body {Faker::Lorem.sentences}
+ f.title {Faker::Lorem.words.join(" ")}
+ f.body {Faker::Lorem.sentences.join(" ")}
f.is_read false
end
diff --git a/test/functional/advertisements_controller_test.rb b/test/functional/advertisements_controller_test.rb
index 7abdf9ae5..af22a0864 100644
--- a/test/functional/advertisements_controller_test.rb
+++ b/test/functional/advertisements_controller_test.rb
@@ -7,22 +7,22 @@ class AdvertisementsControllerTest < ActionController::TestCase
@advertiser = Factory.create(:admin_user)
end
- should "render the new page" do
+ should "get the new page" do
get :new, {}, {:user_id => @advertiser.id}
assert_response :success
end
- should "render the edit page" do
+ should "get the edit page" do
get :edit, {:id => @ad.id}, {:user_id => @advertiser.id}
assert_response :success
end
- should "render the index page" do
+ should "get the index page" do
get :index, {}, {:user_id => @advertiser.id}
assert_response :success
end
- should "render the show page" do
+ should "get the show page" do
get :show, {:id => @ad.id}, {:user_id => @advertiser.id}
assert_response :success
end
diff --git a/test/functional/artist_versions_controller_test.rb b/test/functional/artist_versions_controller_test.rb
index b22b229d5..20b50ba61 100644
--- a/test/functional/artist_versions_controller_test.rb
+++ b/test/functional/artist_versions_controller_test.rb
@@ -13,12 +13,12 @@ class ArtistVersionsControllerTest < ActionController::TestCase
CurrentUser.ip_addr = nil
end
- should "render the index page" do
+ should "get the index page" do
get :index
assert_response :success
end
- should "render the index page when searching for something" do
+ should "get the index page when searching for something" do
get :index, {:search => {:name_equals => @artist.name}}
assert_response :success
end
diff --git a/test/functional/artists_controller_test.rb b/test/functional/artists_controller_test.rb
index d181ee7a2..73d11fd5d 100644
--- a/test/functional/artists_controller_test.rb
+++ b/test/functional/artists_controller_test.rb
@@ -14,22 +14,22 @@ class ArtistsControllerTest < ActionController::TestCase
CurrentUser.ip_addr = nil
end
- should "render the new page" do
+ should "get the new page" do
get :new, {}, {:user_id => @user.id}
assert_response :success
end
- should "render the edit page" do
+ should "get the edit page" do
get :edit, {:id => @artist.id}, {:user_id => @user.id}
assert_response :success
end
- should "render the show page" do
+ should "get the show page" do
get :show, {:id => @artist.id}
assert_response :success
end
- should "render the index page" do
+ should "get the index page" do
get :index
assert_response :success
end
diff --git a/test/functional/bans_controller_test.rb b/test/functional/bans_controller_test.rb
index a9dd3a875..1ac314e0d 100644
--- a/test/functional/bans_controller_test.rb
+++ b/test/functional/bans_controller_test.rb
@@ -14,22 +14,22 @@ class BansControllerTest < ActionController::TestCase
CurrentUser.ip_addr = nil
end
- should "render the new page" do
+ should "get the new page" do
get :new, {}, {:user_id => @user.id}
assert_response :success
end
- should "render the edit page" do
+ should "get the edit page" do
get :edit, {:id => @ban.id}, {:user_id => @user.id}
assert_response :success
end
- should "render the show page" do
+ should "get the show page" do
get :show, {:id => @ban.id}
assert_response :success
end
- should "render the index page" do
+ should "get the index page" do
get :index
assert_response :success
end
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index 7246864ad..dded781f5 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -14,7 +14,7 @@ class CommentsControllerTest < ActionController::TestCase
CurrentUser.ip_addr = nil
end
- should "render the index page" do
+ should "get the index page" do
get :index
assert_response :success
end
diff --git a/test/functional/dmails_controller_test.rb b/test/functional/dmails_controller_test.rb
index 426027563..1121241db 100644
--- a/test/functional/dmails_controller_test.rb
+++ b/test/functional/dmails_controller_test.rb
@@ -1,8 +1,99 @@
require 'test_helper'
class DmailsControllerTest < ActionController::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
+ context "The dmails controller" do
+ setup do
+ @user = Factory.create(:user)
+ @unrelated_user = Factory.create(:user)
+ CurrentUser.user = @user
+ CurrentUser.ip_addr = "127.0.0.1"
+ @dmail = Factory.create(:dmail, :owner => @user)
+ end
+
+ teardown do
+ CurrentUser.user = nil
+ CurrentUser.ip_addr = nil
+ end
+
+ context "new action" do
+ should "get the page" do
+ get :new, {}, {:user_id => @user.id}
+ assert_response :success
+ end
+
+ context "with a respond_to_id" do
+ should "prefill the fields" do
+ get :new, {:respond_to_id => @dmail}, {:user_id => @user.id}
+ assert_response :success
+ assert_not_nil assigns(:dmail)
+ assert_equal(@dmail.from_id, assigns(:dmail).to_id)
+ end
+
+ context "and a forward flag" do
+ should "not populate the to field" do
+ get :new, {:respond_to_id => @dmail, :forward => true}, {:user_id => @user.id}
+ assert_response :success
+ assert_not_nil assigns(:dmail)
+ assert_nil(assigns(:dmail).to_id)
+ end
+ end
+ end
+ end
+
+ context "index action" do
+ should "show dmails owned by the current user" do
+ get :index, {:owner_id_equals => @dmail.owner_id, :folder => "sent"}, {:user_id => @dmail.owner_id}
+ assert_response :success
+
+ get :index, {:owner_id_equals => @dmail.owner_id, :folder => "received"}, {:user_id => @dmail.owner_id}
+ assert_response :success
+ end
+
+ should "not show dmails not owned by the current user" do
+ assert_raises(User::PrivilegeError) do
+ get :index, {:owner_id_equals => @dmail.owner_id}, {:user_id => @unrelated_user.id}
+ end
+ end
+ end
+
+ context "show action" do
+ should "show dmails owned by the current user" do
+ get :show, {:id => @dmail.id}, {:user_id => @dmail.owner_id}
+ assert_response :success
+ end
+
+ should "not show dmails not owned by the current user" do
+ assert_raises(User::PrivilegeError) do
+ get :show, {:id => @dmail.id}, {:user_id => @unrelated_user.id}
+ end
+ end
+ end
+
+ context "create action" do
+ should "create two messages, one for the sender and one for the recipient" do
+ assert_difference("Dmail.count", 2) do
+ dmail_attribs = Factory.attributes_for(:dmail).merge(:to_id => Factory.create(:user).id)
+ post :create, {:dmail => dmail_attribs}, {:user_id => @user.id}
+ assert_redirected_to dmail_path(Dmail.last)
+ end
+ end
+ end
+
+ context "destroy action" do
+ should "allow deletion if the dmail is owned by the current user" do
+ assert_difference("Dmail.count", -1) do
+ post :destroy, {:id => @dmail.id}, {:user_id => @dmail.owner_id}
+ assert_redirected_to dmails_path
+ end
+ end
+
+ should "not allow deletion if the dmail is not owned by the current user" do
+ assert_difference("Dmail.count", 0) do
+ assert_raises(User::PrivilegeError) do
+ post :destroy, {:id => @dmail.id}, {:user_id => @unrelated_user.id}
+ end
+ end
+ end
+ end
end
end
diff --git a/test/functional/favorites_controller_test.rb b/test/functional/favorites_controller_test.rb
index 8c04ef9d6..48a565a74 100644
--- a/test/functional/favorites_controller_test.rb
+++ b/test/functional/favorites_controller_test.rb
@@ -1,8 +1,59 @@
require 'test_helper'
class FavoritesControllerTest < ActionController::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
+ context "The favorites controller" do
+ setup do
+ @user = Factory.create(:user)
+ CurrentUser.user = @user
+ CurrentUser.ip_addr = "127.0.0.1"
+ end
+
+ teardown do
+ CurrentUser.user = nil
+ CurrentUser.ip_addr = nil
+ end
+
+ context "index action" do
+ context "with a specified tags parameter" do
+ should "redirect to the posts controller" do
+ get :index, {:tags => "abc"}, {:user_id => @user}
+ assert_redirected_to(posts_path(:tags => "fav:#{@user.name} abc"))
+ end
+ end
+
+ should "display the current user's favorites" do
+ get :index, {}, {:user_id => @user.id}
+ assert_response :success
+ assert_not_nil(assigns(:post_set))
+ end
+ end
+
+ context "create action" do
+ setup do
+ @post = Factory.create(:post)
+ end
+
+ should "create a favorite for the current user" do
+ assert_difference("Favorite.count(#{@user.id})", 1) do
+ post :create, {:id => @post.id}, {:user_id => @user.id}
+ end
+ end
+ end
+
+ context "destroy action" do
+ setup do
+ @post = Factory.create(:post)
+ Favorite.create(
+ :user_id => @user.id,
+ :post_id => @post.id
+ )
+ end
+
+ should "remove the favorite from the current user" do
+ assert_difference("Favorite.count(#{@user.id})", -1) do
+ post :destroy, {:id => @post.id}, {:user_id => @user.id}
+ end
+ end
+ end
end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3a954b082..83f618b2f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,8 @@
ENV["RAILS_ENV"] = "test"
+require 'simplecov'
+SimpleCov.start 'rails'
+
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
diff --git a/test/unit/dmail_test.rb b/test/unit/dmail_test.rb
index 7fc5af314..a46656572 100644
--- a/test/unit/dmail_test.rb
+++ b/test/unit/dmail_test.rb
@@ -45,7 +45,6 @@ class DmailTest < ActiveSupport::TestCase
dmail = Factory.create(:dmail)
response = dmail.build_response
assert_equal("Re: #{dmail.title}", response.title)
- assert_equal(dmail.id, response.parent_id)
assert_equal(dmail.from_id, response.to_id)
assert_equal(dmail.to_id, response.from_id)
end