Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

bumping plek to 1.0.0

Updated tests to use dev.gov.uk (and therefore 'dev' #{environment}).
It is known that factchecker emails have a temporary workaround at time of writing and this will be revisited by @mnowster. For now, in skyscape preview, we will configure such that no emails are sent
  • Loading branch information...
commit bb388a98c9741516546151dd942a774614659c3c 1 parent 2edef9f
@maxamg maxamg authored
View
6 Gemfile
@@ -32,7 +32,13 @@ gem 'inherited_resources'
gem 'kaminari', '0.13.0'
gem 'lograge'
gem 'mongo', '1.6.2' # Locking this down to avoid a replica set bug
+<<<<<<< HEAD
gem 'plek', '0.3.0'
+=======
+gem 'newrelic_rpm'
+gem 'null_logger'
+gem 'plek', '1.0.0'
+>>>>>>> bumping plek to 1.0.0
gem 'rails', '3.2.8'
gem 'lockfile', require: false
View
13 Gemfile.lock
@@ -187,7 +187,7 @@ GEM
omniauth-oauth2 (1.1.0)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
- plek (0.3.0)
+ plek (1.0.0)
builder
polyglot (0.3.3)
rack (1.4.1)
@@ -298,7 +298,12 @@ DEPENDENCIES
gds-api-adapters (= 4.1.3)
gds-sso (~> 1.2.0)
govspeak (= 1.2.0)
+<<<<<<< HEAD
govuk_content_models (= 2.7.0)
+=======
+ govuk_content_models (= 2.6.1)
+ graylog2_exceptions
+>>>>>>> bumping plek to 1.0.0
has_scope
inherited_resources
jquery-rails
@@ -309,7 +314,13 @@ DEPENDENCIES
lograge
mocha
mongo (= 1.6.2)
+<<<<<<< HEAD
plek (= 0.3.0)
+=======
+ newrelic_rpm
+ null_logger
+ plek (= 1.0.0)
+>>>>>>> bumping plek to 1.0.0
rails (= 3.2.8)
rest-client
retriable
View
2  script/mail_fetcher
@@ -25,7 +25,7 @@ begin
NoisyWorkflow.report_errors(handler.errors).deliver
end
- Rails.logger.info "Finished running MailFetcher in #{Plek.current.environment} mode"
+ Rails.logger.info "Finished running MailFetcher in #{Rails.env} mode"
end
rescue Lockfile::MaxTriesLockError => e
Rails.logger.info "Another email fetcher is already running. Exiting."
View
4 test/functional/noisy_workflow_test.rb
@@ -74,12 +74,12 @@ def publisher_and_guide
test "fact checking emails should set appropriate reply-to address" do
guide, email = fact_check_email
- assert_equal ["factcheck+test-#{guide.id}@alphagov.co.uk"], email.reply_to
+ assert_equal ["factcheck+dev-#{guide.id}@alphagov.co.uk"], email.reply_to
end
test "fact checking emails should go from appropriate email addresses" do
guide, email = fact_check_email
- assert_equal ["factcheck+test-#{guide.id}@alphagov.co.uk"], email.from
+ assert_equal ["factcheck+dev-#{guide.id}@alphagov.co.uk"], email.from
end
context "make_noise" do
Please sign in to comment.
Something went wrong with that request. Please try again.