Merge remote-tracking branch 'upstream/pull/5699'

[rails.git] / config / settings / test.yml

diff --git a/config/settings/test.yml b/config/settings/test.yml
index 0cfa74cd70738ca851244a4830bf2b7bb0ed63fe..3cf8c2836284c5b29fd03251753ea5f25aa3b2aa 100644 (file)
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -20,8 +20,9 @@ trace_file_storage: "test"
 trace_image_storage: "test"
 trace_icon_storage: "test"
 # Lower some rate limits for testing
 trace_image_storage: "test"
 trace_icon_storage: "test"
 # Lower some rate limits for testing

-max_changeset_comments_per_hour: 30
-moderator_changeset_comments_per_hour: 60
+max_changeset_comments_per_hour: 10
+comments_to_max_changeset_comments: 20
+moderator_changeset_comments_per_hour: 15

 # Private key for signing id_tokens
 doorkeeper_signing_key: |
   -----BEGIN PRIVATE KEY-----
 # Private key for signing id_tokens
 doorkeeper_signing_key: |
   -----BEGIN PRIVATE KEY-----


@@ -52,3 +53,7 @@ doorkeeper_signing_key: |
   cK1+/2V+OkM/0nXjxPwPj7LiOediUyZNUn48r29uGOL1S83PSUdyST207CP6mZjc
   K8aJmnGsVEAcWPzbpNh14q/c
   -----END PRIVATE KEY-----
   cK1+/2V+OkM/0nXjxPwPj7LiOediUyZNUn48r29uGOL1S83PSUdyST207CP6mZjc
   K8aJmnGsVEAcWPzbpNh14q/c
   -----END PRIVATE KEY-----

+# Run system tests using headless Firefox
+system_test_headless: true
+# Override Firefox binary used in system tests
+#system_test_firefox_binary: