Fixed tests which were failing from my last changes.

Author: nasa42

app/controllers/tasks_controller.rb

@@ -305,10 +305,10 @@ def get_default_watchers_for_project
     if !params[:id].blank?
       @task = AbstractTask.accessed_by(current_user).find_by_id(params[:id])
     end
+    users = []
     if params[:project_id].present?
-      @default_users = User.joins("INNER JOIN default_project_users on default_project_users.user_id = users.id").where("default_project_users.project_id = ?", params[:project_id])
+      users = Project.find(params[:project_id]).default_users
     end
-    users = @default_users ? @default_users : []
     users.reject! {|u| @task.users.include?(u) }
     res = render_to_string(:partial => "tasks/notification",:collection => users)
     render :text => res

db/migrate/20150926163831_let_timestamps_be_nil_in_default_project_users.rb

@@ -0,0 +1,7 @@
+class LetTimestampsBeNilInDefaultProjectUsers < ActiveRecord::Migration
+  
+  def change
+    change_column :default_project_users, :created_at, :datetime, null: true
+    change_column :default_project_users, :updated_at, :datetime, null: true    
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150915045633) do
+ActiveRecord::Schema.define(:version => 20150926163831) do
 
   create_table "access_levels", :force => true do |t|
     t.string   "name"
@@ -92,8 +92,8 @@
   create_table "default_project_users", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "delayed_jobs", :force => true do |t|

test/blueprints.rb

@@ -131,11 +131,6 @@ def self.paragraphs(paragraph_count = 3)
   company { user.company }
 end
 
-DefaultProjectUsers.blueprint do
-  user_id
-  project_id
-end
-
 TaskFilterUser.blueprint do
 end
 

test/functional/projects_controller_test.rb

@@ -50,11 +50,10 @@ class ProjectsControllerTest < ActionController::TestCase
       description: 'Some description',
       customer_id: @user.customer.id,
       company_id: @user.company.id,
+      default_user_ids: [@user.id],
     }
-     @d_users = [1,2]
-     post :create, project: project_hash, copy_project_id: @project.id, default_users: @d_users
-     users = DefaultProjectUsers.where(project_id: assigns[:project].id)
-     assert_equal users.first.project_id, assigns[:project].id
+     post :create, project: project_hash, copy_project_id: @project.id
+     assert_equal [@user], assigns[:project].default_users
   end
 
   should "get edit project page" do

test/functional/tasks_controller_test.rb

@@ -629,8 +629,7 @@ class << file
     setup do
       @task = @user.tasks.first
       @customer = @task.company.customers.first
-      @project = @customer.projects.make(:company => @task.company)
-      @default_user = DefaultProjectUsers.make(project_id: @project.id,user_id: @user.id)
+      @project = @customer.projects.make(:company => @task.company, default_users: [@user])
     end
 
     should "return auto add users for get_default_watchers_for_project" do