merges master and fixes conflicts

spec/features/admin/comments_spec.rb

@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+feature 'Admin comments' do
+
+  scenario 'Restore', :js do
+    citizen = create(:user)
+    admin = create(:administrator)
+
+    debate = create(:debate)
+    comment = create(:comment, :hidden, commentable: debate, body: 'Not really SPAM')
+
+    login_as(admin.user)
+    visit admin_comments_path
+
+    within("#comment_#{comment.id}") do
+      first(:link, "Restore").click
+    end
+
+    expect(page).to have_content 'The comment has been restored'
+
+    login_as(citizen)
+    visit debate_path(debate)
+
+    expect(page).to have_css('.comment', count: 1)
+    expect(page).to have_content('Not really SPAM')
+  end
+
+end

spec/features/admin/debates_spec.rb

@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+feature 'Admin debates' do
+
+  scenario 'Restore', :js do
+    citizen = create(:user)
+    admin = create(:administrator)
+
+    debate = create(:debate, :hidden)
+
+    login_as(admin.user)
+    visit admin_debate_path(debate)
+
+    click_link 'Restore'
+
+    expect(page).to have_content 'The debate has been restored'
+
+    login_as(citizen)
+    visit debates_path
+
+    expect(page).to have_css('.debate', count: 1)
+  end
+end