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-1505 - fix tests now thaht there is also Alternative Rock

This commit is contained in:
Seth Call 2014-09-10 11:27:55 -05:00
parent 7761c2e9a8
commit 251049bca2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,7 @@ describe "Create Session UI", :js => true, :type => :feature, :capybara_feature
find('li[create-type="schedule-future"] ins').trigger(:click)
find('.btn-next').trigger(:click)
jk_select("Rock", '#create-session-form select[name="genres"]')
jk_select("Alternative Rock", '#create-session-form select[name="genres"]')
fill_in('session-name', :with => "Test Name")
fill_in('session-description', :with => "Test Description")
find('.btn-next').trigger(:click)
@ -167,7 +167,7 @@ describe "Create Session UI", :js => true, :type => :feature, :capybara_feature
find('li[create-type="schedule-future"] ins').trigger(:click)
find('.btn-next').trigger(:click)
jk_select("Rock", '#create-session-form select[name="genres"]')
jk_select("Alternative Rock", '#create-session-form select[name="genres"]')
fill_in('session-name', :with => "Test Name")
fill_in('session-description', :with => "Test Description")
find('.btn-next').trigger(:click)
@ -204,7 +204,7 @@ describe "Create Session UI", :js => true, :type => :feature, :capybara_feature
find('li[create-type="schedule-future"] ins').trigger(:click)
find('.btn-next').trigger(:click)
jk_select("Rock", '#create-session-form select[name="genres"]')
jk_select("Alternative Rock", '#create-session-form select[name="genres"]')
fill_in('session-name', :with => "Test Name")
fill_in('session-description', :with => "Test Description")
find('.btn-next').trigger(:click)
@ -219,7 +219,7 @@ describe "Create Session UI", :js => true, :type => :feature, :capybara_feature
it "initial status" do
find('.session-step-title', text: 'Review & Confirm')
find('em#session-name-disp', text: 'Test Name (Rock)')
find('em#session-name-disp', text: 'Test Name (Alternative Rock)')
find('div#session-description-disp', text: 'Test Description')
find('div#session-language-disp', text: 'English')
find('div#session-invited-disp', text: 'Any interested JamKazam musicians that I approve')

6
web/spec/support/utilities.rb
View File

@ -267,7 +267,7 @@ def create_session(options={})
creator = options[:creator] || FactoryGirl.create(:user)
unique_session_name = options[:name] || "create_join_session #{SecureRandom.urlsafe_base64}"
unique_session_desc = options[:description] || "create_join_session #{SecureRandom.urlsafe_base64}"
genre = options[:genre] || 'Rock'
genre = options[:genre] || 'Alternative Rock'
musician_access = options[:musician_access].nil? ? true : options[:musician_access]
approval_required = options[:approval_required].nil? ? true : options[:approval_required]
fan_access = options[:fan_access].nil? ? true : options[:fan_access]
@ -332,7 +332,7 @@ def schedule_session(options = {})
creator = options[:creator] || FactoryGirl.create(:user)
unique_session_name = options[:name] || "schedule_session #{SecureRandom.urlsafe_base64}"
unique_session_desc = options[:description] || "schedule_session #{SecureRandom.urlsafe_base64}"
genre = options[:genre] || 'Rock'
genre = options[:genre] || 'Alternative Rock'
musician_access = options[:musician_access].nil? ? true : options[:musician_access]
approval_required = options[:approval_required].nil? ? true : options[:approval_required]
fan_access = options[:fan_access].nil? ? true : options[:fan_access]
@ -535,7 +535,7 @@ def random_genre
'R&B',
'Reggae',
'Religious',
'Rock',
'Alternative Rock',
'Ska',
'Other'].sample
end