-
-
+
diff --git a/web/app/views/clients/_feed.html.erb b/web/app/views/clients/_feed.html.erb
index 5f09c1720..80b2a24b1 100644
--- a/web/app/views/clients/_feed.html.erb
+++ b/web/app/views/clients/_feed.html.erb
@@ -1,12 +1,18 @@
-
+
+
-
- <%= image_tag "content/icon_feed.png", {:height => 19, :width => 19} %>
+
+ <%= image_tag "content/icon_feed.png", {:height => 19, :width => 19} %>
+
+
feed
+ <%= render "screen_navigation" %>
+
+
+
+
This feature not yet implemented
+
-
feed
- <%= render "screen_navigation" %>
-
This feature not yet implemented
diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb
index af1d851c6..dc8a54bfb 100644
--- a/web/app/views/clients/_findSession.html.erb
+++ b/web/app/views/clients/_findSession.html.erb
@@ -10,43 +10,47 @@
<%= render "screen_navigation" %>
-
\ No newline at end of file
+
diff --git a/web/config/application.rb b/web/config/application.rb
index ba172f22c..713ee2a1f 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -122,6 +122,10 @@ if defined?(Bundler)
config.aws_bucket = 'jamkazam-dev'
config.aws_bucket_public = 'jamkazam-dev-public'
config.aws_cache = '315576000'
+ config.aws_fullhost = "#{config.aws_bucket_public}.s3.amazonaws.com"
+
+ # cloudfront host
+ config.cloudfront_host = "d34f55ppvvtgi3.cloudfront.net"
# facebook keys
config.facebook_key = '468555793186398'
diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb
index 35f492750..cbc4b11b9 100644
--- a/web/config/environments/development.rb
+++ b/web/config/environments/development.rb
@@ -45,6 +45,9 @@ SampleApp::Application.configure do
TEST_CONNECT_STATES = false
+ # Overloaded value to match production for using cloudfront in dev mode
+ config.cloudfront_host = "d48bcgsnmsm6a.cloudfront.net"
+
# this is totally awful and silly; the reason this exists is so that if you upload an artifact
# through jam-admin, then jam-web can point users at it. I think 99% of devs won't even see or care about this config, and 0% of users
config.jam_admin_root_url = 'http://192.168.1.152:3333'
diff --git a/web/config/environments/production.rb b/web/config/environments/production.rb
index f4328abb5..61a091e10 100644
--- a/web/config/environments/production.rb
+++ b/web/config/environments/production.rb
@@ -76,6 +76,10 @@ SampleApp::Application.configure do
config.aws_bucket = 'jamkazam'
config.aws_bucket_public = 'jamkazam-public'
+ config.aws_fullhost = "#{config.aws_bucket_public}.s3.amazonaws.com"
+
+ # Dev cloudfront hostname
+ config.cloudfront_host = "d34f55ppvvtgi3.cloudfront.net"
# filepicker app configured to use S3 bucket jamkazam
config.filepicker_rails.api_key = "AhUoVoBZSLirP3esyCl7Zz"
diff --git a/web/config/routes.rb b/web/config/routes.rb
index 502796fcd..1bfb079dd 100644
--- a/web/config/routes.rb
+++ b/web/config/routes.rb
@@ -204,6 +204,11 @@ SampleApp::Application.routes.draw do
match '/bands' => 'api_bands#create', :via => :post
match '/bands/:id' => 'api_bands#update', :via => :post
+ # photo
+ match '/bands/:id/photo' => 'api_bands#update_photo', :via => :post
+ match '/bands/:id/photo' => 'api_bands#delete_photo', :via => :delete
+ match '/bands/:id/filepicker_policy' => 'api_bands#generate_filepicker_policy', :via => :get
+
# band members
match '/bands/:id/musicians' => 'api_bands#musician_index', :via => :get
match '/bands/:id/musicians' => 'api_bands#musician_create', :via => :post
@@ -259,6 +264,7 @@ SampleApp::Application.routes.draw do
match '/regions' => 'api_maxmind_requests#regions', :via => :get
match '/cities' => 'api_maxmind_requests#cities', :via => :get
match '/isps' => 'api_maxmind_requests#isps', :via => :get
+ match '/resolved_location' => 'api_maxmind_requests#resolved_location', :via => :get
# Recordings
diff --git a/web/lib/tasks/sample_data.rake b/web/lib/tasks/sample_data.rake
index 60fe3d33a..4aaebfc62 100644
--- a/web/lib/tasks/sample_data.rake
+++ b/web/lib/tasks/sample_data.rake
@@ -27,5 +27,160 @@ namespace :db do
DatabaseCleaner.start
DatabaseCleaner.clean
end
+
+ task populate_friends: :environment do
+ make_friends
+ end
+
+ task populate_bands: :environment do
+ make_bands
+ end
+
+ task populate_band_members: :environment do
+ make_band_members
+ end
+
+ task populate_band_genres: :environment do
+ make_band_genres
+ end
+
+ desc "Fill database with music session sample data"
+ task populate_music_sessions: :environment do
+ make_users(10) if 14 > User.count
+ make_bands if 0==Band.count
+ make_music_sessions_history
+ make_music_sessions_user_history
+ end
end
+def make_music_sessions_history
+ users = User.all.map(&:id)
+ bands = Band.all.map(&:id)
+ genres = Genre.all.map(&:description)
+ 50.times do |nn|
+ obj = MusicSessionHistory.new
+ obj.music_session_id = rand(100000000).to_s
+ obj.description = Faker::Lorem.paragraph
+ obj.user_id = users[rand(users.count)]
+ obj.band_id = bands[rand(bands.count)]
+ obj.created_at = Time.now - rand(1.month.seconds)
+ obj.session_removed_at = obj.created_at + (rand(3)+1).hour
+ obj.genres = genres.shuffle[0..rand(4)].join(' | ')
+ obj.save!
+ end
+end
+
+def make_music_sessions_user_history
+ users = User.all.map(&:id)
+ hists = MusicSessionHistory.all
+ hists.each do |msh|
+ (rand(9)+1).times do |nn|
+ obj = MusicSessionUserHistory.new
+ obj.music_session_id = msh.music_session_id
+ obj.user_id = users[rand(users.count)]
+ obj.created_at = msh.created_at
+ obj.session_removed_at = obj.created_at + (rand(3)+1).hour
+ obj.client_id = rand(100000000).to_s
+ obj.save!
+ end
+ end
+end
+
+def make_band_members
+ Band.find_each do |bb|
+ User.order('RANDOM()').limit(4).each do |uu|
+ BandMusician.create!({:user_id => uu.id, :band_id => bb.id})
+ end
+ end
+end
+
+def make_band_genres
+ Band.find_each do |bb|
+ next if bb.genres.present?
+ Genre.order('RANDOM()').limit(rand(3)+1).each do |gg|
+ bb.genres << gg
+ end
+ end
+end
+
+def make_bands
+ 10.times do |nn|
+ name = Faker::Name.name
+ website = Faker::Internet.url
+ biography = Faker::Lorem.sentence
+ city = 'Austin' # Faker::Address.city
+ state = 'TX' # Faker::Address.state_abbr
+ country = 'US'
+
+ bb = Band.new(
+ name: name,
+ website: website,
+ biography: biography,
+ city: city,
+ state: state,
+ country: country,
+ )
+ begin
+ bb.save!
+ rescue
+ puts $!.to_s + ' ' + bb.errors.inspect
+ end
+
+ end
+end
+
+def make_users(num=99)
+ admin = User.create!( first_name: Faker::Name.name,
+ last_name: Faker::Name.name,
+ email: "example@railstutorial.org",
+ password: "foobar",
+ password_confirmation: "foobar",
+ terms_of_service: true)
+ admin.toggle!(:admin)
+ num.times do |n|
+ email = "example-#{n+1}@railstutorial.org"
+ password = "password"
+ User.create!(first_name: Faker::Name.name,
+ last_name: Faker::Name.name,
+ terms_of_service: true,
+ email: email,
+ password: password,
+ password_confirmation: password)
+ end
+end
+
+def make_microposts
+ users = User.all(limit: 6)
+ 50.times do
+ content = Faker::Lorem.sentence(5)
+ users.each { |user| user.microposts.create!(content: content) }
+ end
+end
+
+def make_relationships
+ users = User.all
+ user = users.first
+ followed_users = users[2..50]
+ followers = users[3..40]
+ followed_users.each { |followed| user.followings << followed }
+ followers.each { |follower| follower.follow!(user) }
+end
+
+def make_followings
+ users = User.all
+ users.each do |uu|
+ users[0..rand(users.count)].shuffle.each do |uuu|
+ uuu.followings << uu unless 0 < UserFollowing.where(:user_id => uu.id, :follower_id => uuu.id).count
+ uu.followings << uuu unless 0 < UserFollowing.where(:user_id => uuu.id, :follower_id => uu.id).count if rand(3)==0
+ end
+ end
+end
+
+def make_friends
+ users = User.all
+ users[6..-1].each do |uu|
+ users[0..5].shuffle.each do |uuu|
+ Friendship.save(uu.id, uuu.id)
+ end
+ end
+end
diff --git a/web/spec/features/bands_spec.rb b/web/spec/features/bands_spec.rb
new file mode 100644
index 000000000..898df6a02
--- /dev/null
+++ b/web/spec/features/bands_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+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
+ Capybara.default_wait_time = 15
+ end
+
+ let(:user) { FactoryGirl.create(:user) }
+ let(:finder) { FactoryGirl.create(:user) }
+
+ before(:each) do
+ UserMailer.deliveries.clear
+ end
+
+ it "band setup is accessible through profile page" do
+ sign_in_poltergeist(user)
+ wait_until_curtain_gone
+ find('div.homecard.profile').trigger(:click)
+ wait_for_ajax
+ find('#profile-bands-link').trigger(:click)
+ wait_for_ajax
+ find('#band-setup-link').trigger(:click)
+ expect(page).to have_selector('#band-setup-title')
+ end
+
+end
+
+
diff --git a/web/spec/features/in_session_spec.rb b/web/spec/features/in_session_spec.rb
index 5d8a1ee38..709777af8 100644
--- a/web/spec/features/in_session_spec.rb
+++ b/web/spec/features/in_session_spec.rb
@@ -21,14 +21,17 @@ describe "In a Session", :js => true, :type => :feature, :capybara_feature => tr
it "can't see a private session until it is made public", :slow => true do
create_session(user, description = "Public or private, I cant decide!")
- set_session_as_private(user)
+ in_client(user) do
+ set_session_as_private
+ end
in_client(finder) do
sign_in_poltergeist finder
visit "/client#/findSession"
expect(page).to have_selector('#sessions-none-found') # verify private session is not found
end
-
- set_session_as_public(user)
+ in_client(user) do
+ set_session_as_public
+ end
join_session(finder, description) # verify the public session is able to be joined
end
@@ -57,11 +60,38 @@ describe "In a Session", :js => true, :type => :feature, :capybara_feature => tr
in_client(finder) { expect(page).to_not have_selector('div.track-label', text: user.name) }
end
- #it "can see all tracks with four users", :slow => true do
- # others = Array.new
- # 3.times { others.push FactoryGirl.create(:user) }
- # create_join_session(user, others)
- # assert_all_tracks_seen(others.push user)
- #end
+ many = 4
+
+ it "can see all tracks with #{many} users in a session", :slow => true do
+ others = Array.new
+ (many-1).times { others.push FactoryGirl.create(:user) }
+ create_join_session(user, others)
+ assert_all_tracks_seen(others.push user)
+ #in_client(others[0]) {page.save_screenshot('tmp/partys_all_here_now.png')}
+ end
+
+ it "a user can change the genre and the change will be seen by another participant" do
+ pending "...it doesn't work this way, but i will reuse this pattern"
+ create_join_session(user, [finder])
+ in_client(user) do
+ @new_genre = change_session_genre
+ end
+ in_client(finder) do
+ expect(get_session_genre).to include(@new_genre)
+ end
+ end
+
+ it "a user can change the genre and the Find Session screen will be updated" do
+ create_session(user)
+ in_client(finder) { sign_in_poltergeist finder }
+ 2.times do
+ in_client(user) do
+ @new_genre = change_session_genre #randomizes it
+ end
+ in_client(finder) do
+ find_session_contains?(@new_genre)
+ end
+ end
+ end
end
diff --git a/web/spec/features/musician_search_spec.rb b/web/spec/features/musician_search_spec.rb
index b2ce07802..e7c29d7aa 100644
--- a/web/spec/features/musician_search_spec.rb
+++ b/web/spec/features/musician_search_spec.rb
@@ -24,14 +24,12 @@ describe "Musician Search", :js => true, :type => :feature, :capybara_feature =>
end
it "shows submits query" do
- find("a#btn-refresh-musicians").trigger(:click)
expect(page).to have_selector('#musician-filter-results .musician-list-result')
end
it "shows blank result set" do
- expect(page).to have_selector('#instrument')
- find('#instrument').find(:xpath, 'option[2]').select_option
- find("a#btn-refresh-musicians").trigger(:click)
+ expect(page).to have_selector('#musician_instrument')
+ find('#musician_instrument').find(:xpath, 'option[2]').select_option
expect(page).to_not have_selector('#musician-filter-results .musician-list-result')
end
diff --git a/web/spec/features/recordings_spec.rb b/web/spec/features/recordings_spec.rb
index dda0de29d..b37891118 100644
--- a/web/spec/features/recordings_spec.rb
+++ b/web/spec/features/recordings_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe "Find Session", :js => true, :type => :feature, :capybara_feature => true, :slow => true do
+describe "Session Recordings", :js => true, :type => :feature, :capybara_feature => true, :slow => true do
subject { page }
diff --git a/web/spec/requests/musician_search_api_spec.rb b/web/spec/requests/musician_search_api_spec.rb
index 11680a2a5..a48a1c6b1 100644
--- a/web/spec/requests/musician_search_api_spec.rb
+++ b/web/spec/requests/musician_search_api_spec.rb
@@ -29,7 +29,7 @@ describe "Musician Search API", :type => :api do
it "default search" do
get_query
good_response
- expect(json['musicians'].count).to be [Search::M_PER_PAGE, User.musicians_geocoded.count].min
+ expect(json['musicians'].count).to be [Search::M_PER_PAGE, User.musicians.count].min
end
context 'location filtering' do
diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb
index 7c8134e78..38e2467e3 100644
--- a/web/spec/support/utilities.rb
+++ b/web/spec/support/utilities.rb
@@ -125,7 +125,7 @@ end
# this code assumes that there are no music sessions in the database. it should fail on the
-# find('.join-link') call if > 1 session exists because capybara will complain of multile matches
+# find('.join-link') call if > 1 session exists because capybara will complain of multiple matches
def join_session(joiner, unique_session_desc)
in_client(joiner) do
@@ -141,6 +141,7 @@ def join_session(joiner, unique_session_desc)
end
end
+
def create_join_session(creator, joiners=[])
creator, unique_session_desc = create_session(creator)
@@ -151,26 +152,61 @@ def create_join_session(creator, joiners=[])
end
-def set_session_as_private(session_owner)
- in_client(session_owner) do
- find('#session-settings-button').trigger(:click)
- within('#session-settings-dialog') do
+def set_session_as_private()
+ find('#session-settings-button').trigger(:click)
+ within('#session-settings-dialog') do
select('Private', :from => 'session-settings-musician-access')
find('#session-settings-dialog-submit').trigger(:click)
- end
end
end
-def set_session_as_public(session_owner)
- in_client(session_owner) do
- find('#session-settings-button').trigger(:click)
- within('#session-settings-dialog') do
- select('Public', :from => 'session-settings-musician-access')
- find('#session-settings-dialog-submit').trigger(:click)
- end
+def set_session_as_public()
+ find('#session-settings-button').trigger(:click)
+ within('#session-settings-dialog') do
+ select('Public', :from => 'session-settings-musician-access')
+ find('#session-settings-dialog-submit').trigger(:click)
end
end
+def get_options(selector)
+ return find(selector).all('option').collect(&:text).uniq
+end
+
+def selected_genres
+ return page.evaluate_script("JK.GenreSelectorHelper.getSelectedGenres('#session-settings-genre')")
+end
+
+def change_session_genre #randomly just change it
+ here = 'select.genre-list'
+ #wait_for_ajax
+ find('#session-settings-button').trigger(:click)
+ within('#session-settings-dialog') do
+ wait_for_ajax
+ @new_genre = get_options(here).-(["Select Genre"]).-(selected_genres).sample.to_s
+ select(@new_genre, :from => 'genres')
+ wait_for_ajax
+ find('#session-settings-dialog-submit').trigger(:click)
+ end
+ return @new_genre
+end
+
+def get_session_genre
+ here = 'select.genre-list'
+ find('#session-settings-button').trigger(:click)
+ wait_for_ajax
+ @current_genres = selected_genres
+ find('#session-settings-dialog-submit').trigger(:click)
+ return @current_genres.join(" ")
+end
+
+def find_session_contains?(text)
+ visit "/client#/findSession"
+ wait_for_ajax
+ within('#find-session-form') do
+ expect(page).to have_text(text)
+ end
+end
+
def assert_all_tracks_seen(users=[])
users.each do |user|
in_client(user) do