Merge branch 'master' into cfp_changes

This commit is contained in:
Stella Rouzi 2017-06-27 18:12:00 +03:00 committed by GitHub
commit 567d5f82a7
4 changed files with 8 additions and 16 deletions

View file

@ -286,8 +286,6 @@ feature 'Version' do
expect(page).to have_text('Someone (probably via the console) created new commercial')
visit admin_conference_program_event_path(conference.short_title, event_without_commercial)
click_link 'History'
expect(event_commercial.id).not_to eq event_commercial.commercialable_id
expect(event_without_commercial.id).to eq event_commercial.id
expect(page).to have_no_text('Someone (probably via the console) created new commercial')
end