Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

admin/spec/features/invited_users_spec.rb

@@ -27,7 +27,7 @@ describe InvitedUser do
 
       end
 
-      it { should have_selector('#main_content .panel:first-child h3', text: "Invited Users nDetails" ); }
+      it { should have_selector('#main_content .panel:first-child h3', text: "Invited Users Details" ); }
       it { UserMailer.deliveries.length.should == 1 }
     end
   end

web/spec/features/find_sessions_spec.rb

@@ -7,14 +7,14 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
   before(:all) do
     Capybara.javascript_driver = :poltergeist
     Capybara.current_driver = Capybara.javascript_driver
-    Capybara.default_wait_time = 20 # these tests are SLOOOOOW
+    Capybara.default_wait_time = 30 # these tests are SLOOOOOW
   end
 
   let(:user) { FactoryGirl.create(:user) }
+  let(:finder) { FactoryGirl.create(:user) }
 
   before(:each) do
     UserMailer.deliveries.clear
-    page.driver.resize(1400, 600) # crude hack
   end
 
   # when no sessions have been created:
@@ -22,7 +22,7 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
 
     sign_in_poltergeist user
     visit "/#/findSession"
-    find('#find-session-form')     # using Capybara to avoid a 'sleep 5'
+    # sleep 10
 
     # verify no sessions are found
     expect(page).to have_selector('#sessions-none-found')
@@ -35,7 +35,7 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
 
     # create session in one client
     in_client(:one) do
-
+      page.driver.resize(1500, 600) # crude hack
       sign_in_poltergeist user
       visit "/#/createSession"
 
@@ -46,8 +46,7 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
         click_link('btn-create-session')     # fails if page width is low
       end
 
-      # sleep 5
-      find('#session-controls')     # using Capybara to avoid a 'sleep 5'
+      # sleep 10
 
       # verify that the in-session page is showing
       expect(page).to have_selector('h2',    text: 'my tracks')
@@ -55,9 +54,10 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
 
     # find session in second client
     in_client(:two) do
-      sign_in_poltergeist user    # (currently uses SAME user login as client one)
+      sign_in_poltergeist finder
       visit "/#/findSession"
-      find('#find-session-form')    # again, using Capybara to avoid a 'sleep'
+      # sleep 10
+      puts finder.email + " attempting to see session of " + user.email
 
       # verify the session description is seen by second client
       expect(page).to have_text(@unique_session_desc)

web/spec/features/user_progression_spec.rb

@@ -21,7 +21,7 @@ describe "User Progression", :js => true,  :type => :feature, :capybara_feature
       FactoryGirl.create(:artifact_update, :product => 'JamClient/MacOSX')
     end
 
-    # right after you signup as a musician, you are downloaded to a page that let's you download the client.
+    # right after you signup as a musician, you are downloaded to a page that lets you download the client.
     describe "post-signup" do
       before do
         visit signup_path