Merge branch 'release/0.20'0.20.0.0

Conflicts:
  config/general.yml-example

1 files changed, 32 insertions, 0 deletions

diff --git a/spec/factories/censor_rules.rb b/spec/factories/censor_rules.rb
new file mode 100644
index 000000000..2c0b2c822
--- /dev/null
+++ b/spec/factories/censor_rules.rb
@@ -0,0 +1,32 @@
+FactoryGirl.define do
+
+    factory :censor_rule do
+        text 'some text to redact'
+        replacement '[REDACTED]'
+        last_edit_editor 'FactoryGirl'
+        last_edit_comment 'Modified by rspec'
+
+        factory :regexp_censor_rule do
+            text '\w+@\w+'
+            regexp true
+        end
+
+        factory :info_request_censor_rule do
+            info_request
+        end
+
+        factory :public_body_censor_rule do
+            public_body
+        end
+
+        factory :user_censor_rule do
+            user
+        end
+
+        factory :global_censor_rule do
+            initialize_with { CensorRule.new(:allow_global => true) }
+        end
+
+    end
+
+end