fixing conflicts

2015-07-27 23:29:32 +02:00
parent 137267887c 99481722ce
commit cc3f151914
18 changed files with 115 additions and 23 deletions
--- a/spec/features/tags_spec.rb
+++ b/spec/features/tags_spec.rb
@@ -82,7 +82,10 @@ feature 'Tags' do
    click_button 'Actualizar Debate'

    expect(page).to have_content 'Debate actualizado correctamente'
-    expect(page).to have_content 'Economía, Hacienda'
+    within('.tags') do
+      expect(page).to have_css('a', text: 'Economía')
+      expect(page).to have_css('a', text: 'Hacienda')
+    end
  end

  scenario 'Delete' do