* test tweaks

This commit is contained in:
Seth Call 2014-04-03 15:38:58 +01:00
parent 7e8b6eb238
commit 7816007361
2 changed files with 13 additions and 15 deletions

View File

@ -8,7 +8,7 @@ FactoryGirl.define do
password "foobar"
password_confirmation "foobar"
email_confirmed true
show_whats_next = false #annoying for testing, usually
show_whats_next false #annoying for testing, usually
musician true
city "Apex"
state "NC"

View File

@ -3,24 +3,22 @@ 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
}
before(:each) do
Capybara.javascript_driver = :poltergeist
Capybara.current_driver = Capybara.javascript_driver
@user = FactoryGirl.create(:user)
inst2 = MusicianInstrument.new
inst2.instrument = Instrument.find('drums')
inst2.proficiency_level = 2
inst2.priority = 1
@user.musician_instruments << inst2
end
describe "sessions" do
before(:each) do
create_session(@user)
formal_leave_by(@user)
create_session(user)
formal_leave_by(user)
end
# it "should render avatar" do
@ -52,9 +50,9 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do
describe "recordings" do
before(:each) do
start_recording_with(@user)
start_recording_with(user)
stop_recording
formal_leave_by(@user)
formal_leave_by(user)
end
# it "should render avatar" do