summaryrefslogtreecommitdiff
path: root/test/functional/conference_invitees_controller_test.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 22:17:32 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 22:17:32 +0100
commitaf79440bd75d2cffb2eb0ba43b5cfe918a78162c (patch)
treefd6c4dab5dc56fed5f616ddec20e1f82780f20fe /test/functional/conference_invitees_controller_test.rb
parent648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 (diff)
parent9f14a9a6573db607b79124524088803812454515 (diff)
Merge branch 'rename_factory_class' into develop
Conflicts: Gemfile.lock
Diffstat (limited to 'test/functional/conference_invitees_controller_test.rb')
-rw-r--r--test/functional/conference_invitees_controller_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/conference_invitees_controller_test.rb b/test/functional/conference_invitees_controller_test.rb
index 72d2e2c..8ac5479 100644
--- a/test/functional/conference_invitees_controller_test.rb
+++ b/test/functional/conference_invitees_controller_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
class ConferenceInviteesControllerTest < ActionController::TestCase
setup do
- @conference_invitee = Factory.create(:conference_invitee)
+ @conference_invitee = FactoryGirl.create(:conference_invitee)
end
# test "should get index" do