Merge branch 'master' into cy-type-number-email-fixes

docs/themes/cypress/layout/partial/header.swig

@@ -1,8 +1,8 @@
 <header id="header" class="wrapper">
   <div id="header-inner" class="inner">
     <h1 id="logo-wrap">
-      <a href="{{ url_for_lang('') }}" id="logo">
-        <img src="{{ url_for_lang('') }}{{ config.logo }}" alt="Cypress"/>
+      <a href="{{ site.data['main-menu'].guides }}" id="logo">
+        <img src="/{{ config.logo }}" alt="Cypress"/>
       </a>
     </h1>
     <nav id="main-nav">

packages/driver/gulpfile.coffee

@@ -56,8 +56,14 @@ specRunnerOptions = {
 
 server = { runSpec: -> }
 
+srcDir = path.join(__dirname, "src")
+testDir = path.join(__dirname, "test")
+
 matchingSpecFile = (filePath) ->
-  specPath = filePath.replace(path.join(__dirname, "src"), path.join(__dirname, "test/unit"))
+  ## only files in src/ having matching spec files
+  return false if not _.includes(filePath, srcDir)
+
+  specPath = filePath.replace(srcDir, path.join(__dirname, "test/unit"))
   specPath = specPath.replace(".coffee", "_spec.coffee")
   try
     fs.statSync(specPath)

packages/driver/test/support/server/runner.coffee

@@ -130,7 +130,7 @@ module.exports = class Runner
 
   run: (specPath) ->
     specPath = specPath
-    .replace(path.join(__dirname, "../.."), "specs/")
+    .replace(path.join(__dirname, "../.."), "specs")
     .replace(path.extname(specPath), "")
 
     for id, client of @_clients