spec/models/data_grid_spec.rb in marty-2.1.0 vs spec/models/data_grid_spec.rb in marty-2.1.1

@@ -183,13 +183,14 @@
     before(:each) do
       #Mcfly.whodunnit = Marty::User.find_by_login('marty')
       marty_whodunnit
     end
 
-    def lookup_grid_helper(pt, gridname, params, follow=false)
+    def lookup_grid_helper(pt, gridname, params, follow=false, distinct=true)
       dgh=Marty::DataGrid.lookup_h(pt, gridname)
-      res=Marty::DataGrid.lookup_grid_distinct_entry_h(pt, params, dgh, nil, follow)
+      res=Marty::DataGrid.lookup_grid_distinct_entry_h(pt, params, dgh, nil, follow,
+                                                       false, distinct)
       [res["result"], res["name"]]
     end
 
     describe "imports" do
       it "should not allow imports with trailing blank columns" do
@@ -487,24 +488,23 @@
                                  {"state" => "GU", "ltv" => 81},
                                 )
         expect(res).to eq [456,"G9"]
       end
 
-      it "should handle nil attr values to match wildcard" do
+      it "should raise on nil attr values" do
         dg_from_import("G9", G9)
 
-        res = lookup_grid_helper('infinity',
+        expect{lookup_grid_helper('infinity',
                                "G9",
                                {"state" => nil, "ltv" => 81},
-                               )
-        expect(res).to eq [456,"G9"]
+                               )}.to raise_error(/matches > 1/)
 
-        expect {
-          res = lookup_grid_helper('infinity',
-                                     "G9",
-                                     {"state" => "CA", "ltv" => nil},
-                                    )
-        }.to raise_error(RuntimeError)
+        res = lookup_grid_helper('infinity',
+                                 "G9",
+                                 {"state" => "CA", "ltv" => nil},
+                                 false, false)
+        expect(res).to eq [123,"G9"]
+
       end
 
       it "should handle boolean keys" do
         res = lookup_grid_helper('infinity',
                                  "G4",