Fixes broken seed TESTOPTS="--seed=17880"

Author: BookOfGreg

test/support/webpacker_helpers.rb

@@ -21,10 +21,10 @@ def compile
     return unless available?
     clear_webpacker_packs
     Dir.chdir("./test/#{DUMMY_LOCATION}") do
-      # capture_io do
+      capture_io do
         Rake::Task['webpacker:compile'].reenable
         Rake::Task['webpacker:compile'].invoke
-      # end
+      end
     end
     # Reload cached JSON manifest:
     manifest_refresh
@@ -40,122 +40,107 @@ def clear_webpacker_packs
     FileUtils.rm_rf(PACKS_DIRECTORY)
   end
 
-  if MAJOR < 3
-    def manifest_refresh
-      Webpacker::Manifest.load
+  # Start a webpack-dev-server
+  # Call the block
+  # Make sure to clean up the server
+  def with_dev_server
+
+    old_env = ENV['NODE_ENV']
+    ENV['NODE_ENV'] = 'development'
+
+    # Start the server in a forked process:
+    webpack_dev_server = Dir.chdir("test/#{DUMMY_LOCATION}") do
+      spawn 'RAILS_ENV=development ./bin/webpack-dev-server '
     end
-  else
-    def manifest_refresh
-      Webpacker.manifest.refresh
+
+    stop_time = Time.now + 30.seconds
+    detected_dev_server = false
+    loop do
+      detected_dev_server = dev_server_running?
+      break if detected_dev_server || Time.now > stop_time
+      sleep 0.5
     end
+
+    # If we didn't hook up with a dev server after waiting, fail loudly.
+    raise 'Failed to start dev server' unless detected_dev_server
+    puts 'Detected dev server - Continuing'
+
+    # Call the test block:
+    yield
+
+  ensure
+    # Kill the server process
+    puts "Killing webpack dev server"
+    kill_cmd = "kill -9 #{webpack_dev_server}"
+
+    puts kill_cmd
+    `#{kill_cmd}`
+    # Remove the dev-server packs:
+    WebpackerHelpers.clear_webpacker_packs
+    ENV['NODE_ENV'] = old_env
+    puts "Killed."
   end
 
-  if MAJOR < 3
+  if MAJOR < 3 # Old webpackers
+
+    def dev_server_running?
+      manifest_refresh
+      example_asset_path = manifest_data.values.first
+      begin
+        file = open('http://localhost:8080/packs/application.js')
+      rescue StandardError => e
+        file = nil
+      end
+      if !example_asset_path.start_with?('http://localhost:8080') && ! file
+        puts "Manifest doesn't include absolute path to dev server"
+        return false
+      end
+      true
+    end
+
+    def manifest_refresh
+      Webpacker::Manifest.load
+    end
+
     def manifest_lookup name
       Webpacker::Manifest.load(name)
     end
-  else
-    def manifest_lookup _
-      Webpacker.manifest
-    end
-  end
 
-  if MAJOR < 3
     def manifest_data
       Webpacker::Manifest.instance.data
     end
-  else
-    def manifest_data
-      Webpacker.manifest.refresh
-    end
-  end
 
-  # Start a webpack-dev-server
-  # Call the block
-  # Make sure to clean up the server
-  def with_dev_server
-    # Start the server in a forked process:
-    webpack_dev_server = Dir.chdir("test/#{DUMMY_LOCATION}") do
-      spawn 'RAILS_ENV=development ./bin/webpack-dev-server '
-    end
+  else # New webpackers
 
-    detected_dev_server = false
+    def dev_server_running?
+      Webpacker.instance.instance_variable_set(:@config, nil)
+      return false unless Webpacker.dev_server.running?
 
-    # Wait for it to start up, make sure it's there by connecting to it:
-    30.times do |i|
+      ds = Webpacker.dev_server
+      example_asset_path = manifest_data.values.first
       begin
-        # Make sure that the manifest has been updated:
-        manifest_lookup("./test/#{DUMMY_LOCATION}/public/packs/manifest.json")
-        example_asset_path = manifest_data.values.first
-        if example_asset_path.nil?
-          # Debug helper
-          # puts "Manifest is blank, all manifests:"
-          # Dir.glob("./test/#{DUMMY_LOCATION}/public/packs/*.json").each do |f|
-          #   puts f
-          #   puts File.read(f)
-          # end
-          next
-        end
-        # Make sure the dev server is up:
-        if MAJOR < 3
-          file = open('http://localhost:8080/packs/application.js')
-          if !example_asset_path.start_with?('http://localhost:8080') && ! file
-            raise "Manifest doesn't include absolute path to dev server"
-          end
-        else
-          # Webpacker proxies the dev server when Rails is running in Webpacker 3
-          #  so the manifest doens't have absolute paths anymore..
-          # Reload webpacker config.
-          old_env = ENV['NODE_ENV']
-          ENV['NODE_ENV'] = 'development'
-          Webpacker.instance.instance_variable_set(:@config, nil)
-          Webpacker.config
-          running = Webpacker.dev_server.running?
-          ENV['NODE_ENV'] = old_env
-          raise "Webpack Dev Server hasn't started yet" unless running
-        end
-
-        detected_dev_server = true
-        break
-      rescue StandardError => err
-        puts err.message
-      ensure
-        sleep 0.5
-        # debug counter
-        # puts i
+        file = open("#{ds.protocol}://#{ds.host}:#{ds.port}#{example_asset_path}")
+      rescue StandardError => e
+        file = nil
       end
+      if ! file
+        puts "Dev server is not serving assets yet"
+        return false
+      end
+      true
     end
 
-    # If we didn't hook up with a dev server after waiting, fail loudly.
-    unless detected_dev_server
-      raise 'Failed to start dev server'
+    def manifest_refresh
+      Webpacker.manifest.refresh
     end
 
-    # Call the test block:
-    yield
-  ensure
-    # Kill the server process
-    # puts "Killing webpack dev server"
-    check_cmd = 'lsof -i :8080 -S'
-    10.times do
-      # puts check_cmd
-      status = `#{check_cmd}`
-      # puts status
-      remaining_pid_match = status.match(/\n[a-z]+\s+(\d+)/)
-      if remaining_pid_match
-        remaining_pid = remaining_pid_match[1]
-        # puts "Remaining #{remaining_pid}"
-        kill_cmd = "kill -9 #{remaining_pid}"
-        # puts kill_cmd
-        `#{kill_cmd}`
-        sleep 0.5
-      else
-        break
-      end
+    def manifest_lookup _
+      Webpacker.manifest
+    end
+
+    def manifest_data
+      Webpacker.manifest.refresh
     end
 
-    # Remove the dev-server packs:
-    WebpackerHelpers.clear_webpacker_packs
-    # puts "Killed."
   end
 end