fixes conflicts

2015-09-14 16:46:00 +02:00
parent e9e339fa50 1e96bba262
commit c9e46e3d8f
21 changed files with 87 additions and 59 deletions
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -66,9 +66,9 @@ describe User do
  end

  describe 'preferences' do
-    describe 'email_on_debate_comment' do
+    describe 'email_on_comment' do
      it 'should be false by default' do
-        expect(subject.email_on_debate_comment).to eq(false)
+        expect(subject.email_on_comment).to eq(false)
      end
    end