Merge branch 'develop' of github.com:sebbacon/alaveteli into develop

2 files changed, 12 insertions, 1 deletions

diff --git a/spec/models/track_mailer_spec.rb b/spec/models/track_mailer_spec.rb
index 828904d02..b90ca7e52 100644
--- a/spec/models/track_mailer_spec.rb
+++ b/spec/models/track_mailer_spec.rb
@@ -21,7 +21,8 @@ describe TrackMailer do
                 @user = mock_model(User, :no_xapian_reindex= => false,
                                          :last_daily_track_email= => true,
                                          :save! => true,
-                                         :url_name => 'test-name')
+                                         :url_name => 'test-name',
+                                         :get_locale => 'en')
                 User.stub!(:find).and_return([@user])
                 @user.stub!(:no_xapian_reindex=)
             end
diff --git a/spec/models/track_thing_spec.rb b/spec/models/track_thing_spec.rb
index 6b9cd6d4a..1a0324a78 100644
--- a/spec/models/track_thing_spec.rb
+++ b/spec/models/track_thing_spec.rb
@@ -28,5 +28,15 @@ describe TrackThing, "when tracking changes" do
         found_track.should == @track_thing
     end
 
+    it "will make some sane descriptions of search-based tracks" do
+        tests = [['bob variety:user', "users matching text 'bob'"],
+                 ['bob (variety:sent OR variety:followup_sent OR variety:response OR variety:comment) (latest_status:successful OR latest_status:partially_successful OR latest_status:rejected OR latest_status:not_held)', "requests which are successful or unsuccessful or comments matching text 'bob'"],
+                 ['(latest_status:waiting_response OR latest_status:waiting_clarification OR waiting_classification:true)', 'requests which are awaiting a response']]
+        for query, description in tests
+            track_thing = TrackThing.create_track_for_search_query(query)
+            track_thing.track_query_description.should == description
+        end
+    end
+
 end