diff options
author | Gareth Rees <gareth@mysociety.org> | 2014-06-25 12:49:17 +0100 |
---|---|---|
committer | Gareth Rees <gareth@mysociety.org> | 2014-06-25 12:49:17 +0100 |
commit | fe5880e555f98350b4c08a4885c560e35692687f (patch) | |
tree | 31ae4a508ec50a1c4801a56d85f1329848358380 /spec/controllers/general_controller_spec.rb | |
parent | c99c9ef86c9020939cf8d0930faca5bd206e111f (diff) | |
parent | f23b89f3474847cdd14ba892c5a7259964e18148 (diff) |
Merge branch 'issues/1434-email-highlighting' into rails-3-develop
Diffstat (limited to 'spec/controllers/general_controller_spec.rb')
-rw-r--r-- | spec/controllers/general_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 7590a5b42..c0a9d57d3 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -188,7 +188,7 @@ describe GeneralController, 'when using xapian search' do it 'should highlight words for a user-only request' do get :search, :combined => "bob/users" - assigns[:highlight_words].should == ['bob'] + assigns[:highlight_words].should == [/\b(bob)\w*\b/iu, /\b(bob)\b/iu] end it 'should show spelling corrections for a user-only request' do |