From e1d20949f542a22b7e957ce4f239811d4b19cbd7 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Thu, 3 Apr 2014 15:44:02 +0100 Subject: [PATCH] * make 'two-instrument' user --- web/spec/factories.rb | 6 ++++++ web/spec/features/feed_spec.rb | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/spec/factories.rb b/web/spec/factories.rb index 657eaa675..18b4b9843 100644 --- a/web/spec/factories.rb +++ b/web/spec/factories.rb @@ -28,6 +28,12 @@ FactoryGirl.define do user.musician_instruments << FactoryGirl.build(:musician_instrument, user: user) end + factory :user_two_instruments do + before(:create) do |user| + user.musician_instruments << FactoryGirl.create(:musician_instrument, user: user, instrument: Instrument.find('drums'), proficiency_level: 2, priority:1 ) + end + end + factory :single_user_session do after(:create) do |user, evaluator| music_session = FactoryGirl.create(:music_session, :creator => user) diff --git a/web/spec/features/feed_spec.rb b/web/spec/features/feed_spec.rb index cecaa22ff..1c48a7b4c 100644 --- a/web/spec/features/feed_spec.rb +++ b/web/spec/features/feed_spec.rb @@ -3,13 +3,7 @@ require 'spec_helper' describe "Feed", :js => true, :type => :feature, :capybara_feature => true do - let (:user) { - u = FactoryGirl.create(:user) - inst2 = FactoryGirl.create(:musician_instrument, user: u, instrument: Instrument.find('drums'), proficiency_level: 2, priority:1) - u.musician_instruments << inst2 - u.save! - u - } + let (:user) { FactoryGirl.create(:user_two_instruments) } before(:each) do end