Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
baf181f1d7
3
Gemfile
3
Gemfile
|
@ -27,6 +27,7 @@ group :test do
|
|||
gem "mocha", "~> 0.13.3"
|
||||
gem 'capybara', '~> 2.0.0'
|
||||
gem 'nokogiri', '< 1.6.0'
|
||||
gem 'factory_girl'
|
||||
|
||||
platforms :mri, :mingw do
|
||||
group :rmagick do
|
||||
|
@ -43,7 +44,7 @@ group :development, :test do
|
|||
gem 'spork-testunit'
|
||||
gem 'guard-spork'
|
||||
gem 'guard-test', '~> 1.0.0'
|
||||
#gem 'ruby-prof'
|
||||
gem 'ruby-prof' unless RUBY_PLATFORM =~ /w32/
|
||||
gem 'pry'
|
||||
gem 'pry-nav'
|
||||
end
|
||||
|
|
|
@ -117,3 +117,9 @@ FactoryGirl.define do
|
|||
end
|
||||
|
||||
end
|
||||
ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__)+ '/fixtures/',
|
||||
[ :code_review_assignments,
|
||||
:code_reviews,
|
||||
:code_review_project_settings,
|
||||
:code_review_user_settings])
|
||||
|
||||
|
|
|
@ -21,6 +21,11 @@ class CodeReviewAssignmentTest < ActiveSupport::TestCase
|
|||
fixtures :code_review_assignments, :issues, :issue_statuses,
|
||||
:projects, :trackers, :projects_trackers, :users, :members, :repositories,
|
||||
:enumerations
|
||||
ActiveRecord::Fixtures.create_fixtures(File.dirname(__FILE__)+ '/../fixtures/',
|
||||
[ :code_review_assignments,
|
||||
:code_reviews,
|
||||
:code_review_project_settings,
|
||||
:code_review_user_settings])
|
||||
|
||||
def setup
|
||||
@assignment = CodeReviewAssignment.new
|
||||
|
|
Loading…
Reference in New Issue