team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes to spec_helper and user model

Browse Source
This commit is contained in:
Michael McCabe
2013-09-06 15:54:06 -04:00
parent dc3de592ea
commit 69c180e845
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/user.rb
+2
View File
@@ -18,6 +18,8 @@ class User < ActiveRecord::Base
has_many :performance, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy has_many :performance, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy
private
def full_name def full_name
"#{self.first_name} #{self.last_name}" "#{self.first_name} #{self.last_name}"
end end
spec/spec_helper.rb
-1
View File
@@ -1,7 +1,6 @@
# This file is copied to spec/ when you run 'rails generate rspec:install' # This file is copied to spec/ when you run 'rails generate rspec:install'
ENV["RAILS_ENV"] ||= 'test' ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__) require File.expand_path("../../config/environment", __FILE__)
require 'minitest/autorun'
require 'rspec/rails' require 'rspec/rails'
require 'rspec/autorun' require 'rspec/autorun'