cleaning up spec suite a bit. lots in here that isn't needed and/or has changed

Author: fermion

Gemfile

@@ -49,6 +49,7 @@ group :test do
   gem 'factory_girl_rails'
   gem 'mocha',                                   require: false
   gem 'nokogiri'
+  gem 'timecop'
 end
 
 group :production do

Gemfile.lock

@@ -224,6 +224,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.19.1)
     tilt (1.4.1)
+    timecop (0.7.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -276,5 +277,6 @@ DEPENDENCIES
   sqlite3
   taps
   thin
+  timecop
   uglifier (>= 1.0)
   unicorn

app/controllers/application_controller.rb

@@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base
 
   before_filter :require_current_user, :require_current_company, :set_mobile_view
 
-  protected 
+  protected
 
   def find_target
     return unless %w(projects users clients).include? controller_name
@@ -33,7 +33,7 @@ def current_user
   end
   helper_method :current_user
 
-  def require_current_user 
+  def require_current_user
     unless current_user.present?
       if request.get? && !request.xhr?
         cookies[:original_request] = {value: Marshal.dump(request.path_parameters), expires: 2.minutes.from_now}
@@ -52,6 +52,8 @@ def set_mobile_view
       session[:mobile_view] = params[:mobile_view] == "true"
       set_mobile_format
     end
+    
+    true
   end
 
 end

app/controllers/clients_controller.rb

@@ -1,7 +1,7 @@
 class ClientsController < ApplicationController
   respond_to :json
 
-  before_filter only: [:show, :edit, :update, :destroy] do |c| 
+  before_filter only: [:show, :edit, :update, :destroy] do |c|
     c.find_target
   end
 

app/mailers/registration_mailer.rb

@@ -2,12 +2,18 @@ class RegistrationMailer < ActionMailer::Base
 
   def registration_notification(user, company)
     @registration_info = OpenStruct.new(:first_name => user.first_name, :last_name => user.last_name, :company_name => company.name, :email_address => user.email)
-    mail :to => User.where(:first_name => "Juhan", :last_name => "Sonin").first.email, :from => "[email protected]", :subject => "Someone has registered a StaffPlan account"
+    
+    if Rails.env.production?
+      mail :to => User.where(:first_name => "Juhan", :last_name => "Sonin").first.email, :from => "[email protected]", :subject => "Someone has registered a StaffPlan account"
+    end
   end
 
   def add_staff_notification(user, company)
     @registration_info = OpenStruct.new(:first_name => user.first_name, :last_name => user.last_name, :company_name => company.name, :email_address => user.email)
-    mail :to => User.where(:first_name => "Juhan", :last_name => "Sonin").first.email, :from => "[email protected]", :subject => "A new StaffPlan account was just created"
+    
+    if Rails.env.production?
+      mail :to => User.where(:first_name => "Juhan", :last_name => "Sonin").first.email, :from => "[email protected]", :subject => "A new StaffPlan account was just created"
+    end
   end
 
   def registration_confirmation user
@@ -17,7 +23,7 @@ def registration_confirmation user
 
   def invitation(user, inviting_user)
     @user = user
-    @admin = inviting_user 
+    @admin = inviting_user
     mail to: @user.email, from: "[email protected]", subject: "You're invited to join our project planning and collaboration system"
   end
 

app/models/client.rb

@@ -1,5 +1,4 @@
 class Client < ActiveRecord::Base
-  include StaffPlan::AuditMethods
   has_paper_trail
 
   DEFAULT_CLIENT_NAME = "N/A"
@@ -12,8 +11,6 @@ class Client < ActiveRecord::Base
 
   default_scope(order: "name ASC")
 
-  after_update :update_originator_timestamp
-
   def staff_plan_json
     Jbuilder.encode do |json|
       json.(self, :id, :name, :active)

app/models/company.rb

@@ -1,5 +1,4 @@
 class Company < ActiveRecord::Base
-  include StaffPlan::AuditMethods
   has_paper_trail
   attr_accessible :name
 
@@ -13,11 +12,9 @@ class Company < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name
 
-  after_update :update_originator_timestamp 
-  
   # Goes as follows:
   # We're deleting a company. Before that happens, we'll take all that company's users
-  # and set their current_company_id to any other company they're a member of, or to 
+  # and set their current_company_id to any other company they're a member of, or to
   # nil if they don't have any left beyond the one we're deleting
   before_destroy do |record|
     record.users.where(current_company_id: record.id).all.each do |user|

app/models/project.rb

@@ -1,5 +1,4 @@
 class Project < ActiveRecord::Base
-  include StaffPlan::AuditMethods
   has_paper_trail
 
   attr_accessible :name, :active, :payment_frequency, :cost, :client
@@ -12,8 +11,7 @@ class Project < ActiveRecord::Base
   has_many :users, through: :assignments
 
   before_save :check_cost
-  after_update :update_originator_timestamp
-
+  
   validates_presence_of :name, :client
   validates_uniqueness_of :name, case_sensitive: false, scope: :client_id
 

app/models/work_week.rb

@@ -1,6 +1,4 @@
 class WorkWeek < ActiveRecord::Base
-  include StaffPlan::AuditMethods
-
   has_paper_trail
 
   attr_accessible :estimated_hours, :actual_hours, :beginning_of_week, :cweek, :year
@@ -14,27 +12,25 @@ class WorkWeek < ActiveRecord::Base
 
   before_validation :set_beginning_of_week_if_blank
 
-  after_update :update_originator_timestamp 
-
   ################################# SCOPES ####################################
 
   scope :for_range, lambda { |lower, upper|
-    if lower.cweek <= upper.cweek 
-      where(year: lower.year, cweek: Range.new(lower.cweek,upper.cweek)) 
-    else # The date range spans over two years 
+    if lower.cweek <= upper.cweek
+      where(year: lower.year, cweek: Range.new(lower.cweek,upper.cweek))
+    else # The date range spans over two years
       query = "(cweek >= ? AND year = ?) OR (cweek <= ? AND year = ?)"
       where(query, lower.cweek, lower.year, upper.cweek, upper.year)
     end
   }
 
-  scope :with_hours, lambda { where("estimated_hours IS NOT NULL OR actual_hours IS NOT NULL") }  
+  scope :with_hours, lambda { where("estimated_hours IS NOT NULL OR actual_hours IS NOT NULL") }
 
   def proposed?
     project.assignments.where(user_id: user.id).first.try(:proposed?) || false
   end
 
   def set_beginning_of_week_if_blank
-    if self.beginning_of_week.blank?
+    if self.beginning_of_week.blank? && self.year.present? && self.cweek.present?
       self.beginning_of_week = Date.commercial(self.year, self.cweek).to_datetime.to_i
     end
   end

config/environments/development.rb

@@ -12,9 +12,10 @@
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
+  
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
+  config.action_mailer.raise_delivery_errors = true
   config.action_mailer.default_url_options = {host: "localhost", port: "3000"}
 
   # Print deprecation notices to the Rails logger