From 0e01e9cc5265f8593c0faf375348cef8b6266cb8 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 8 Feb 2015 15:06:17 -0600 Subject: [PATCH 1/6] * shortening kickstarter URL --- web/app/views/landings/watch_overview_1.html.slim | 2 +- web/app/views/users/welcome.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/app/views/landings/watch_overview_1.html.slim b/web/app/views/landings/watch_overview_1.html.slim index 34f552ae7..b0e8f055d 100644 --- a/web/app/views/landings/watch_overview_1.html.slim +++ b/web/app/views/landings/watch_overview_1.html.slim @@ -19,7 +19,7 @@ h2 More Resources: a href="https://www.youtube.com/watch?v=_7qj5RXyHCo" rel="external" | See kudos and endorsements from JamKazam users - a href="https://www.kickstarter.com/projects/jamkazam/jamblaster-play-music-in-real-time-with-others-from-home" rel="external" + a href="https://www.kickstarter.com/projects/jamkazam/jamblaster-play-music-in-real-time-with-others-fro" rel="external" | Visit the JamBlaster page on KickStarter diff --git a/web/app/views/users/welcome.html.haml b/web/app/views/users/welcome.html.haml index cf159cbed..bd3034e84 100644 --- a/web/app/views/users/welcome.html.haml +++ b/web/app/views/users/welcome.html.haml @@ -12,7 +12,7 @@ //= render :partial => 'users/follow_links' - if Rails.application.config.show_jamblaster_kickstarter_link .jamfest - %a{ href: 'https://www.kickstarter.com/projects/jamkazam/jamblaster-play-music-in-real-time-with-others-from-home', style: 'font-size:20px;margin-top:11px' } + %a{ href: 'https://www.kickstarter.com/projects/jamkazam/jamblaster-play-music-in-real-time-with-others-fro', style: 'font-size:20px;margin-top:11px' } = "Check out our new " %span.jamblaster JamBlaster = " on " From 558db2c37bc5e34231e5b00f91f1f193fde70c8c Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Sun, 8 Feb 2015 20:25:55 -0600 Subject: [PATCH 2/6] VRFS-850 - adding test for VRFS-2266 --- web/spec/features/feed_spec.rb | 2 -- web/spec/features/in_session_spec.rb | 16 +++++++++++++++- web/spec/support/utilities.rb | 6 ++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/web/spec/features/feed_spec.rb b/web/spec/features/feed_spec.rb index 02035dbbf..62004cbda 100644 --- a/web/spec/features/feed_spec.rb +++ b/web/spec/features/feed_spec.rb @@ -218,7 +218,6 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do formal_leave_by(finder_2) formal_leave_by(creator) - #leave_music_session_sleep_delay #erg in_client(creator) { verify_feed_shows_users creator, finder_1, finder_2 } end @@ -227,7 +226,6 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do formal_leave_by(finder_1) join_session(finder_2, description: description) - #leave_music_session_sleep_delay #erg in_client(finder_1) { verify_feed_shows_users finder_2, creator } end end diff --git a/web/spec/features/in_session_spec.rb b/web/spec/features/in_session_spec.rb index a657162c1..b2b1cb77e 100644 --- a/web/spec/features/in_session_spec.rb +++ b/web/spec/features/in_session_spec.rb @@ -84,7 +84,7 @@ describe "In a Session", :js => true, :type => :feature, :capybara_feature => tr end it "can rejoin private session as creator" do - pending + #pending creator, description = create_join_session(user, [finder]) in_client(user) do @@ -95,4 +95,18 @@ describe "In a Session", :js => true, :type => :feature, :capybara_feature => tr join_session(user, description: description) end + + specify "creator should receive join requests after changing session to 'by approval' (VRFS-2266)" do + creator, description = create_session + in_client(creator) do + set_session_access :by_approval + end + + request_to_join_session(finder, description: description) + + in_client(creator) do + expand_sidebar :notifications + expect(page).to have_content "#{finder.name} has requested to join your session." + end + end end diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb index fa4638405..f54c23538 100644 --- a/web/spec/support/utilities.rb +++ b/web/spec/support/utilities.rb @@ -669,6 +669,12 @@ def sidebar_search_for string, category wait_for_ajax end +def expand_sidebar header_name + #search, friends, chat, notifications + panel_id = "panel#{header_name.to_s.capitalize}" + within("div[layout-id='#{panel_id}']") { find('div.panel-header').trigger(:click) } +end + def show_user_menu page.execute_script("$('ul.shortcuts').show()") #page.execute_script("JK.UserDropdown.menuHoverIn()") From d70ec7ac0ec82cf31bb606db2bf965227231fe36 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Sun, 8 Feb 2015 21:01:57 -0600 Subject: [PATCH 3/6] VRFS-850 additional tests --- web/spec/features/in_session_spec.rb | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/web/spec/features/in_session_spec.rb b/web/spec/features/in_session_spec.rb index b2b1cb77e..99a88f891 100644 --- a/web/spec/features/in_session_spec.rb +++ b/web/spec/features/in_session_spec.rb @@ -109,4 +109,36 @@ describe "In a Session", :js => true, :type => :feature, :capybara_feature => tr expect(page).to have_content "#{finder.name} has requested to join your session." end end + + specify "invitee receives notification when creator invites musician" do + pending "blocked on testing this via front-end - fakeJamClient doesn't support invite UX" + user = FactoryGirl.create(:user) + invitee = FactoryGirl.create(:user) + FactoryGirl.create(:friendship, :user => user, :friend => invitee) + in_client(user) do + create_session + find('#session-invite-musicians').trigger(:click) + find('#btn-choose-friends-update').trigger(:click) + within('#friend-selector-list') { find("tr[user-id='#{invitee.id}']").trigger(:click) } + find('#btn-save-friends').trigger(:click) + find('#btn-save-invites').trigger(:click) + end + + in_client(invitee) do + fast_signin(invitee, "/client#/home") + expand_sidebar :notifications + expect(page).to have_content "invited you" + end + end + + specify "user is able to see recording in 'Open Recording' modal" do + recording = FactoryGirl.create(:recording, owner: user) + in_client(user) do + create_session + find('#open-a-recording').trigger(:click) + within('table.local-recordings') do + expect(page).to have_content recording.name + end + end + end end From f3bae8a97b81d57be78441c8f0bed5f6eae7ec42 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Sun, 8 Feb 2015 21:15:20 -0600 Subject: [PATCH 4/6] VRFS-1967 - clear up error message to assist user --- web/app/assets/javascripts/configureTracksHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/configureTracksHelper.js b/web/app/assets/javascripts/configureTracksHelper.js index 32f220366..ba16f1d28 100644 --- a/web/app/assets/javascripts/configureTracksHelper.js +++ b/web/app/assets/javascripts/configureTracksHelper.js @@ -355,7 +355,7 @@ context._.each(tracks.tracks, function(track) { if(!track.instrument_id) { logger.debug("ConfigureTracks validation error: all tracks with ports assigned must specify an instrument."); - context.JK.Banner.showAlert('All tracks with ports assigned must specify an instrument.'); + context.JK.Banner.showAlert('Please use the instrument icons to choose what you plan to play on each track.'); return false; } }); From 249209677e3f912d11c4c3372079d8e98d864bc4 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Sun, 8 Feb 2015 23:06:56 -0600 Subject: [PATCH 5/6] VRFS-905 - updating this spec --- web/spec/features/bands_spec.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/web/spec/features/bands_spec.rb b/web/spec/features/bands_spec.rb index d243b6bcb..eb3834be3 100644 --- a/web/spec/features/bands_spec.rb +++ b/web/spec/features/bands_spec.rb @@ -158,8 +158,16 @@ describe "Bands", :js => true, :type => :feature, :capybara_feature => true do expect(page).to have_selector('.result-name', text: band_musician.name) end - it "displays photo, name, location, instruments played" - it "displays a hover bubble containing more info on musician" + it "displays photo, name, location for member" do + sign_in_poltergeist fan + visit "/client#/bandProfile/#{band_musician.bands.first.id}" + find('#band-profile-members-link').trigger(:click) + within "div.band-profile-members" do + find(".avatar-small img") + find(".result-name", text: band_musician.name) + find(".result-location", text: "#{band_musician.city}, #{band_musician.state}") + end + end it "displays any pending band invitations when viewed by current band member" do friend = user From df60a4340421310343cae5873f3ae9a665b88e7a Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 9 Feb 2015 18:07:49 -0600 Subject: [PATCH 6/6] * adding gear dump --- web/lib/tasks/gear.rake | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 web/lib/tasks/gear.rake diff --git a/web/lib/tasks/gear.rake b/web/lib/tasks/gear.rake new file mode 100644 index 000000000..e44b63851 --- /dev/null +++ b/web/lib/tasks/gear.rake @@ -0,0 +1,59 @@ +namespace :gear do + + task analyze: :environment do + + successful = {types: {}} + + Diagnostic.where("type = 'GEAR_SELECTION'").each do |diagnostic| + + data = JSON.parse(diagnostic.data) + + os = data["summary"]["os"] # MacOSX or Win32 + success = data["summary"]["success"] # bool + + if success + latency = data["summary"]["score"]["latencyScore"]["latency"] + id = data["summary"]["selectedDevice"]["input"]["info"]["id"] + displayName = data["summary"]["selectedDevice"]["input"]["info"]["displayName"] + type = data["summary"]["selectedDevice"]["input"]["info"]["type"] + + store = successful[:types][type] + + if !store + store = {} + successful[:types][type] = store + end + + deviceData = store[id + ':' + latency.to_i.to_s] + + if !deviceData + deviceData = {id: id, displayName: displayName, type: type, latency: latency, count: 0} + store[id + ':' + latency.to_i.to_s] = deviceData + end + + deviceData[:count] = deviceData[:count] + 1 + end + end + + puts "TYPES:" + successful[:types].each do|type, hits| + puts "#{type}" + end + puts "" + puts "" + + successful[:types].each do |type, hits| + results = hits.sort_by do |id_latency, deviceData| + deviceData[:latency] + end + + puts "--------------- #{type} -----------------" + + results.each do |result| + puts "#{result[1][:latency].to_i.to_s.rjust(2)} #{result[1][:displayName]}" + end + puts "" + puts "" + end + end +end