seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-2478 : Fix a few more tests.

This commit is contained in:
Steven Miers 2014-11-13 11:05:29 -06:00
parent b282a69927
commit 9cd9f5d58a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/app/views/clients/_web_filter.html.erb
View File

@ -18,8 +18,8 @@
<!-- @end sort filter -->
<% elsif :jamtrack != filter_label %>
<!-- @begin order by filter -->
<%= content_tag(:div, 'Filter By:', :class => 'filter-element desc') %>
<%= select_tag("#{filter_label}_order_by", options_for_select(Search::ORDERINGS), {:class => "#{filter_label}-order-by easydropdown"} ) %>
<%= content_tag(:div, 'Order By:', :class => 'filter-element desc') %>
<%= select_tag("#{filter_label}_order_by", options_for_select(Search::M_ORDERINGS), {:class => "#{filter_label}-order-by easydropdown"} ) %>
<!-- @end order by filter -->
<% end %>
<% end -%>
@ -33,9 +33,9 @@
<% end %>
<% if :musician == filter_label || :jamtrack == filter_label %>
<!-- @begin instrument filter -->
<%= content_tag(:div, 'Instrument:', :class => 'filter-element desc') %>
<%= content_tag(:div, 'Instrument:', :class => 'filter-element desc instrument-selector') %>
<%= select_tag("#{filter_label}_instrument",
options_for_select([['Any', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] })), {:class=> "easydropdown"}) %>
options_for_select([['Any', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] })), {:class=> "easydropdown"}) %>
<!-- @end instrument filter -->
<% end %>
<% if :feed == filter_label %>

8
web/spec/features/jamtrack_shopping_spec.rb
View File

@ -3,10 +3,10 @@ require 'spec_helper'
describe "JamTrack Shopping", :js => true, :type => :feature, :capybara_feature => true do
let(:user) { FactoryGirl.create(:user) }
let(:jt_us) { FactoryGirl.create(:jam_track, sales_region: 'United States', make_track: true) }
let(:jt_ww) { FactoryGirl.create(:jam_track, sales_region: 'Worldwide', make_track: true) }
let(:jt_rock) { FactoryGirl.create(:jam_track, genre: JamRuby::Genre.find('rock'), make_track: true) }
let(:jt_blues) { FactoryGirl.create(:jam_track, genre: JamRuby::Genre.find('blues'), make_track: true) }
let(:jt_us) { FactoryGirl.create(:jam_track, :name=>'jt_us', sales_region: 'United States', make_track: true) }
let(:jt_ww) { FactoryGirl.create(:jam_track, :name=>'jt_ww', sales_region: 'Worldwide', make_track: true) }
let(:jt_rock) { FactoryGirl.create(:jam_track, :name=>'jt_rock', genre: JamRuby::Genre.find('rock'), make_track: true) }
let(:jt_blues) { FactoryGirl.create(:jam_track, :name=>'jt_blues', genre: JamRuby::Genre.find('blues'), make_track: true) }
before(:each) do
ShoppingCart.delete_all