diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-12-03 09:22:41 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-12-03 09:22:41 +0000 |
| commit | 7414ed478f212be2b48c95fafde15726b348b197 (patch) | |
| tree | 1d89b90f604b837b097fb4274775c4f3b3a319d6 /spec/spec_helper.rb | |
| parent | 479c9cd4567e2042d00c347f25a411373a6b1df9 (diff) | |
| parent | d05082c1cf1ddec789e547b54943f6e7d5bdffc1 (diff) | |
Merge branch 'release/0.20'0.20.0.0
Conflicts:
config/general.yml-example
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0e3fe35c7..74a4891c2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -201,14 +201,6 @@ Spork.prefork do I18n.default_locale = original_default_locale end - def load_test_categories - PublicBodyCategories.add(:en, [ - "Local and regional", - [ "local_council", "Local councils", "a local council" ], - "Miscellaneous", - [ "other", "Miscellaneous", "miscellaneous" ],]) - end - def basic_auth_login(request, username = nil, password = nil) username = AlaveteliConfiguration::admin_username if username.nil? password = AlaveteliConfiguration::admin_password if password.nil? |