Merge remote-tracking branch 'origin/release/0.6.8'0.6.8

Conflicts:
  locale/cs/app.po
  locale/sl/app.po
  locale/sq/app.po
  locale/tr/app.po
  locale/uk/app.po

1 files changed, 5 insertions, 4 deletions

diff --git a/spec/models/track_thing_spec.rb b/spec/models/track_thing_spec.rb
index 345629bd6..c42eb5e8b 100644
--- a/spec/models/track_thing_spec.rb
+++ b/spec/models/track_thing_spec.rb
@@ -35,10 +35,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']]
-        for query, description in tests
+        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.each do |query, description|
             track_thing = TrackThing.create_track_for_search_query(query)
             track_thing.track_query_description.should == description
         end