Bug 1104925: followup to fix tests, r+a=me
authorGavin Sharp <gavin@gavinsharp.com>
Tue, 25 Nov 2014 17:29:47 -0800
changeset 227442 48cf662ee226f8adc5f9d0e149c2035a238e11d3
parent 227439 c0c3429824fcc3ebd11409664c8a8b4c739849da
child 227443 21c5b265756ead78c44dab5428430abb555c9232
child 227477 a3cc435fd3c315e5dfe9329d03d5943bb893cced
push id592
push usergsharp@mozilla.com
push dateWed, 26 Nov 2014 01:33:03 +0000
treeherdermozilla-release@21c5b265756e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1104925
milestone34.0
Bug 1104925: followup to fix tests, r+a=me
browser/components/search/test/browser_yahoo.js
browser/components/search/test/browser_yahoo_behavior.js
--- a/browser/components/search/test/browser_yahoo.js
+++ b/browser/components/search/test/browser_yahoo.js
@@ -8,17 +8,17 @@
 "use strict";
 
 const BROWSER_SEARCH_PREF = "browser.search.";
 
 function test() {
   let engine = Services.search.getEngineByName("Yahoo");
   ok(engine, "Yahoo");
 
-  let base = "https://search.yahoo.com/search?p=foo&ei=UTF-8&fr=moz35";
+  let base = "https://search.yahoo.com/yhs/search?p=foo&ei=UTF-8&hspart=mozilla&hsimp=yhs-001";
   let url;
 
   // Test search URLs (including purposes).
   url = engine.getSubmission("foo").uri.spec;
   is(url, base, "Check search URL for 'foo'");
 
   // Check search suggestion URL.
   url = engine.getSubmission("foo", "application/x-suggestions+json").uri.spec;
@@ -56,31 +56,36 @@ function test() {
               value: "{searchTerms}",
               purpose: undefined,
             },
           ],
         },
         {
           type: "text/html",
           method: "GET",
-          template: "https://search.yahoo.com/search",
+          template: "https://search.yahoo.com/yhs/search",
           params: [
             {
               name: "p",
               value: "{searchTerms}",
               purpose: undefined,
             },
             {
               name: "ei",
               value: "UTF-8",
               purpose: undefined,
             },
             {
-              name: "fr",
-              value: "moz35",
+              name: "hspart",
+              value: "mozilla",
+              purpose: undefined,
+            },
+            {
+              name: "hsimp",
+              value: "yhs-001",
               purpose: undefined,
             },
           ],
           mozparams: {},
         },
       ],
     },
   };
--- a/browser/components/search/test/browser_yahoo_behavior.js
+++ b/browser/components/search/test/browser_yahoo_behavior.js
@@ -12,17 +12,17 @@ const BROWSER_SEARCH_PREF = "browser.sea
 
 function test() {
   let engine = Services.search.getEngineByName("Yahoo");
   ok(engine, "Yahoo is installed");
 
   let previouslySelectedEngine = Services.search.currentEngine;
   Services.search.currentEngine = engine;
 
-  let base = "https://search.yahoo.com/search?p=foo&ei=UTF-8&fr=moz35";
+  let base = "https://search.yahoo.com/yhs/search?p=foo&ei=UTF-8&hspart=mozilla&hsimp=yhs-001";
   let url;
 
   // Test search URLs (including purposes).
   url = engine.getSubmission("foo").uri.spec;
   is(url, base, "Check search URL for 'foo'");
 
   waitForExplicitFinish();