diff --git a/web/app/assets/javascripts/jam_track_screen.js.coffee b/web/app/assets/javascripts/jam_track_screen.js.coffee index 9fc419a9b..3a56a2572 100644 --- a/web/app/assets/javascripts/jam_track_screen.js.coffee +++ b/web/app/assets/javascripts/jam_track_screen.js.coffee @@ -311,8 +311,8 @@ context.JK.JamTrackScreen=class JamTrackScreen throw new Error('@artist must be specified') if @instrument.length == 0 throw new Error('@instrument must be specified') - if @availability.length == 0 - throw new Error('@availability must be specified') + #if @availability.length == 0 + # throw new Error('@availability must be specified') this.events() diff --git a/web/app/views/clients/_web_filter.html.haml b/web/app/views/clients/_web_filter.html.haml index c6d8c95f4..6d36e4a54 100644 --- a/web/app/views/clients/_web_filter.html.haml +++ b/web/app/views/clients/_web_filter.html.haml @@ -46,7 +46,7 @@ %span#musician-filter-city -elsif :jamtrack==filter_label / =content_tag(:div, 'Availability:', :class => 'filter-element desc') - =select_tag("#{filter_label}_availability", options_for_select([['Any Availability', '']].concat(JamRuby::JamTrack::SALES_REGION), ''), {:class => "easydropdown"}) + / =select_tag("#{filter_label}_availability", options_for_select([['Any Availability', '']].concat(JamRuby::JamTrack::SALES_REGION), ''), {:class => "easydropdown"}) -else =content_tag(:div, 'Within', :class => 'filter-element desc') =content_tag(:div, :class => 'query-distance-params') do diff --git a/web/spec/features/jamtrack_shopping_spec.rb b/web/spec/features/jamtrack_shopping_spec.rb index 4273067ce..3cf01fc6d 100644 --- a/web/spec/features/jamtrack_shopping_spec.rb +++ b/web/spec/features/jamtrack_shopping_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature => true do let(:user) { FactoryGirl.create(:user, has_redeemable_jamtrack: false) } - let(:jt_us) { FactoryGirl.create(:jam_track, :name=>'jt_us', sales_region: 'United States', make_track: true, original_artist: "foobar") } + let(:jt_us) { FactoryGirl.create(:jam_track, :name=>'jt_us', sales_region: 'Worldwide', make_track: true, original_artist: "foobar") } let(:jt_ww) { FactoryGirl.create(:jam_track, :name=>'jt_ww', sales_region: 'Worldwide', make_track: true, original_artist: "barfoo") } let(:jt_rock) { FactoryGirl.create(:jam_track, :name=>'jt_rock', genre: JamRuby::Genre.find('rock'), make_track: true, original_artist: "badfood") } let(:jt_blues) { FactoryGirl.create(:jam_track, :name=>'jt_blues', genre: JamRuby::Genre.find('blues'), make_track: true, original_artist: "foodbart") } @@ -67,7 +67,7 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature visit "/client#/jamtrackBrowse" find('h1', text: 'jamtracks') - jk_select('Any', '#jamtrack-find-form #jamtrack_availability') + jk_select('Any', '#jamtrack-find-form #jamtrack_artist') end it "shows all JamTracks" do @@ -76,12 +76,15 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature find_jamtrack jt_rock end +=begin + # removed for now it "filters with availability" do - jk_select('Worldwide', '#jamtrack-find-form #jamtrack_availability') + jk_select('Worldwide', '#jamtrack-find-form #jamtrack_artist') find_jamtrack jt_ww not_find_jamtrack jt_us not_find_jamtrack jt_rock end +=end it "filters with artist" do jk_select("foobar", '#jamtrack-find-form #jamtrack_artist') @@ -113,7 +116,7 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature visit "/client#/jamtrackBrowse" find('h1', text: 'jamtracks') - jk_select('Any', '#jamtrack-find-form #jamtrack_availability') + jk_select('Any', '#jamtrack-find-form #jamtrack_artist') end it "adds/deletes JamTrack to/from Cart" do @@ -124,13 +127,13 @@ describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature find('.cart-item-price', text: "$ #{jt_us.price}") find('a.button-orange', text: 'CONTINUE SHOPPING').trigger(:click) - jk_select('Any', '#jamtrack-find-form #jamtrack_availability') + jk_select('Any', '#jamtrack-find-form #jamtrack_artist') find_jamtrack jt_us, {added_cart: true} find('a.header-shopping-cart').trigger(:click) find("a.remove-cart").trigger(:click) find('a.button-orange', text: 'CONTINUE SHOPPING').trigger(:click) - jk_select('Any', '#jamtrack-find-form #jamtrack_availability') + jk_select('Any', '#jamtrack-find-form #jamtrack_artist') find_jamtrack jt_us