diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-05-13 16:50:20 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-05-13 16:50:20 +0100 |
| commit | e771d2fa2477906333428b87924e737369c81bd4 (patch) | |
| tree | a70c71028889e539a99cbdc7071cd1d626686f35 | |
| parent | aa67dc94f8c5631ae5da889fa2d976196ee63f91 (diff) | |
| parent | fe36e66dcb23175d583300a1811f547d5d7bca8b (diff) | |
Merge branch 'hotfix/0.21.0.29'0.21.0.29
| -rw-r--r-- | config/initializers/alaveteli.rb | 2 | ||||
| -rw-r--r-- | spec/mailers/request_mailer_spec.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index d0174c44b..38340b220 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -10,7 +10,7 @@ load "debug_helpers.rb" load "util.rb" # Application version -ALAVETELI_VERSION = '0.21.0.28' +ALAVETELI_VERSION = '0.21.0.29' # Add new inflection rules using the following format # (all these examples are active by default): diff --git a/spec/mailers/request_mailer_spec.rb b/spec/mailers/request_mailer_spec.rb index a26be866e..6a45d0e94 100644 --- a/spec/mailers/request_mailer_spec.rb +++ b/spec/mailers/request_mailer_spec.rb @@ -194,9 +194,6 @@ describe RequestMailer, " when receiving incoming mail" do receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "") ir.incoming_messages.size.should == 1 - last_event = ir.info_request_events.last - last_event.params[:rejected_reason].should =~ /there is no "From" address/ - deliveries = ActionMailer::Base.deliveries deliveries.size.should == 0 deliveries.clear |