diff --git a/web/spec/features/bands_spec.rb b/web/spec/features/bands_spec.rb index 5ec9848cb..d8e2b9b78 100644 --- a/web/spec/features/bands_spec.rb +++ b/web/spec/features/bands_spec.rb @@ -4,8 +4,6 @@ describe "Bands", :js => true, :type => :feature, :capybara_feature => true do subject { page } - - before(:all) do Capybara.javascript_driver = :poltergeist Capybara.current_driver = Capybara.javascript_driver diff --git a/web/spec/features/feed_spec.rb b/web/spec/features/feed_spec.rb index 1c48a7b4c..49c98b9d0 100644 --- a/web/spec/features/feed_spec.rb +++ b/web/spec/features/feed_spec.rb @@ -2,11 +2,8 @@ require 'spec_helper' describe "Feed", :js => true, :type => :feature, :capybara_feature => true do - - let (:user) { FactoryGirl.create(:user_two_instruments) } + let (:user) { FactoryGirl.create(:user) } - before(:each) do - end describe "sessions" do @@ -26,6 +23,7 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do it "should render details" do visit "/client#/feed" + find('.feed-details a.details').trigger(:click) # confirm user avatar exists @@ -33,7 +31,6 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do # confirm instrument icons exist find("img[instrument-id=\"electric guitar\"]") - find("img[instrument-id=\"drums\"]") end # it "should render play widget" do @@ -44,6 +41,7 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do describe "recordings" do before(:each) do + MusicSessionHistory.delete_all start_recording_with(user) stop_recording formal_leave_by(user) @@ -60,6 +58,7 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do it "should render details" do visit "/client#/feed" + find('.feed-details a.details').trigger(:click) # confirm user avatar exists @@ -67,7 +66,6 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do # confirm instrument icons exist find("img[instrument-id=\"electric guitar\"]") - find("img[instrument-id=\"drums\"]") end # it "should render play widget" do