merged from upstream

This commit is contained in:
raluka 2015-10-14 16:02:40 +02:00
commit 9eb47bd3f0
19 changed files with 82 additions and 58 deletions

View file

@ -105,7 +105,8 @@ feature 'Has correct abilities' do
visit admin_conference_path(conference2.short_title)
expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard')
expect(page).to have_link('Basics', href: "/admin/conference/#{conference2.short_title}/edit")
expect(page).to_not have_link('Basics', href: "/admin/conference/#{conference2.short_title}/edit")
expect(page).to have_text('Basics')
expect(page).to_not have_link('Contact', href: "/admin/conference/#{conference2.short_title}/contact/edit")
expect(page).to have_link('Commercials', href: "/admin/conference/#{conference2.short_title}/commercials")
expect(page).to have_link('Events', href: "/admin/conference/#{conference2.short_title}/events")
@ -176,7 +177,8 @@ feature 'Has correct abilities' do
visit admin_conference_path(conference3.short_title)
expect(page).to have_selector('li.nav-header.nav-header-bigger a', text: 'Dashboard')
expect(page).to have_link('Basics', href: "/admin/conference/#{conference3.short_title}/edit")
expect(page).to_not have_link('Basics', href: "/admin/conference/#{conference2.short_title}/edit")
expect(page).to have_text('Basics')
expect(page).to_not have_link('Contact', href: "/admin/conference/#{conference3.short_title}/contact/edit")
expect(page).to have_link('Commercials', href: "/admin/conference/#{conference3.short_title}/commercials")
expect(page).to_not have_link('Events', href: "/admin/conference/#{conference3.short_title}/events")