diff --git a/app/models/user.rb b/app/models/user.rb index 7e92104..a9ecca8 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,6 +18,8 @@ class User < ActiveRecord::Base has_many :performance, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy + private + def full_name "#{self.first_name} #{self.last_name}" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9417bfa..d2cbea7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,6 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__) -require 'minitest/autorun' require 'rspec/rails' require 'rspec/autorun'