diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 22:17:32 +0100 |
| commit | af79440bd75d2cffb2eb0ba43b5cfe918a78162c (patch) | |
| tree | fd6c4dab5dc56fed5f616ddec20e1f82780f20fe /test/functional/conferences_controller_test.rb | |
| parent | 648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 (diff) | |
| parent | 9f14a9a6573db607b79124524088803812454515 (diff) | |
Merge branch 'rename_factory_class' into develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'test/functional/conferences_controller_test.rb')
| -rw-r--r-- | test/functional/conferences_controller_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/conferences_controller_test.rb b/test/functional/conferences_controller_test.rb index 954838b..0f2d007 100644 --- a/test/functional/conferences_controller_test.rb +++ b/test/functional/conferences_controller_test.rb @@ -3,7 +3,7 @@ require 'test_helper' class ConferencesControllerTest < ActionController::TestCase setup do - @conference = Factory.create(:conference) + @conference = FactoryGirl.create(:conference) end # test "should get index" do |