gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into redirect_conf_show

Browse source
This commit is contained in:
James Mason 2017-12-11 17:23:32 -08:00 • committed by GitHub
commit 30de487872
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
93 changed files with 410 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/features/versions_spec.rb
View file

@ -148,7 +148,7 @@ feature 'Version' do
visit admin_revision_history_path
expect(page).to have_text("Someone (probably via the console) created new ticket Gold with ID #{ticket_id} in conference #{conference.short_title}")
expect(page).to have_text("Someone (probably via the console) updated price cents and description of ticket Gold with ID #{ticket_id} in conference #{conference.short_title}")
expect(page).to have_text("Someone (probably via the console) updated description and price cents of ticket Gold with ID #{ticket_id} in conference #{conference.short_title}")
expect(page).to have_text("Someone (probably via the console) deleted ticket Gold with ID #{ticket_id} in conference #{conference.short_title}")
end
@ -343,7 +343,7 @@ feature 'Version' do
conference.email_settings.update_attributes(registration_subject: 'xxxxx', registration_body: 'yyyyy', accepted_subject: 'zzzzz')
visit admin_revision_history_path
expect(page).to have_text("Someone (probably via the console) updated registration subject, registration body and accepted subject
expect(page).to have_text("Someone (probably via the console) updated registration body, registration subject and accepted subject
of email settings in conference #{conference.short_title}")
end