diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-04-04 10:44:18 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-04-04 10:44:18 +0100 |
| commit | 0b6dc324f305ca22d084cd7429752ff145d9772f (patch) | |
| tree | e0efb9fefcd13ea749cc41606511ebb569d0b255 /spec/models | |
| parent | bdb7ae6b556176f21cf58a7b897e74cdbf409352 (diff) | |
| parent | cad028436eb79a9cb88038b3653adca4827efe6b (diff) | |
Merge branch 'feature/1310-better-track-translation' into rails-3-develop
Conflicts:
spec/factories.rb
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/track_thing_spec.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/models/track_thing_spec.rb b/spec/models/track_thing_spec.rb index 1c582564b..3edf2d1ad 100644 --- a/spec/models/track_thing_spec.rb +++ b/spec/models/track_thing_spec.rb @@ -51,10 +51,11 @@ describe TrackThing, "when tracking changes" do 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)' => "comments or requests which are successful or unsuccessful matching text 'bob'", - '(latest_status:waiting_response OR latest_status:waiting_clarification OR waiting_classification:true)' => 'requests which are awaiting a response', - ' (variety:sent OR variety:followup_sent OR variety:response OR variety:comment)' => 'all requests or comments' } + tests = { ' (variety:sent OR variety:followup_sent OR variety:response OR variety:comment)' => 'all requests or comments', + 'bob (variety:sent OR variety:followup_sent OR variety:response OR variety:comment)' => "all requests or comments matching text 'bob'", + 'bob (latest_status:successful OR latest_status:partially_successful)' => "requests which are successful matching text 'bob'", + '(latest_status:successful OR latest_status:partially_successful)' => 'requests which are successful', + 'bob' => "anything matching text 'bob'" } tests.each do |query, description| track_thing = TrackThing.create_track_for_search_query(query) track_thing.track_query_description.should == description |