From 9cd9f5d58afcae6b2955258df808b306cf5ae62a Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Thu, 13 Nov 2014 11:05:29 -0600 Subject: [PATCH] VRFS-2478 : Fix a few more tests. --- web/app/views/clients/_web_filter.html.erb | 8 ++++---- web/spec/features/jamtrack_shopping_spec.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/app/views/clients/_web_filter.html.erb b/web/app/views/clients/_web_filter.html.erb index e3a8be9f4..c192c0f82 100644 --- a/web/app/views/clients/_web_filter.html.erb +++ b/web/app/views/clients/_web_filter.html.erb @@ -18,8 +18,8 @@ <% elsif :jamtrack != filter_label %> - <%= 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 %> <% end -%> @@ -33,9 +33,9 @@ <% end %> <% if :musician == filter_label || :jamtrack == filter_label %> - <%= 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 %> <% if :feed == filter_label %> diff --git a/web/spec/features/jamtrack_shopping_spec.rb b/web/spec/features/jamtrack_shopping_spec.rb index f81746bb6..e383192cd 100644 --- a/web/spec/features/jamtrack_shopping_spec.rb +++ b/web/spec/features/jamtrack_shopping_spec.rb @@ -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