cypress_rails 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3368e52934ad619056582bd906ea33b0b27a1168
-  data.tar.gz: bdf8ca62c0c646c3197dedd7496db37f86df8797
+  metadata.gz: 70d8ba1c2c997e512573b35b6823f9b14f930262
+  data.tar.gz: b75040d5e579711328d36e3691fc92aa9361505a
 SHA512:
-  metadata.gz: 347ff016801044922dfc9c6b67311b5302663911159b1d1fe70261840a54c9c1270a86b7e07fa1f7d1d1f182e3f955a3c3223159620338bd7fbd6e1958e65643
-  data.tar.gz: 94fc750a210c5d306e91b32cad21608123c360403b543fce286bc60907e76f8927394f11f949c81453df522c37d148ac39bc75dc379f4fa8a215c8640dfa454a
+  metadata.gz: 6481e794afc07e83d8786feccf7883b4cf9c8f35a8a156aae299dbe31d01fe2d42d1b332f3ca4da9e1f43b2faf67a5f031a403cd0d625c0a40b655d57ee0d280
+  data.tar.gz: 2018f01916a2632972d136936679b39b7c8d15b90b49399d464d5a9af7ca2c73a2192443d352212cee4f5640cf4df3c1c34665b4f58a32341e9faecf13f12a06

data/lib/cypress_rails/cli.rb

@@ -5,7 +5,9 @@ require "cypress_rails/runner"
 require "cypress_rails/server"
 
 module CypressRails
-  Config = Struct.new(:command, :cypress_bin_path, :host, :log_path, :tests_path)
+  Config = Struct.new(
+    :command, :cypress_bin_path, :host, :log_path, :tests_path, :healthcheck_url
+  )
 
   class CLI < Thor
     class_option :command,
@@ -33,6 +35,12 @@ module CypressRails
       desc: "path to Cypress tests",
       default: "./spec",
       aliases: %w(-t)
+    class_option :healthcheck_url,
+      type: :string,
+      desc: <<~DESC,
+        url to ping the server before running tests (you don't need the port, it will be injected)
+      DESC
+      aliases: %w(-u)
 
     desc "test", "Run all tests in headless mode"
     def test
@@ -55,12 +63,14 @@ module CypressRails
     private
 
     def server
-      @server ||= Server.new(config.host, config.command, config.log_path)
+      @server ||= Server.new(config.host, config.command, config.healthcheck_url, config.log_path)
     end
 
     def config
       @config ||= Config.new(
-        *options.values_at(:command, :cypress_bin_path, :host, :log_path, :tests_path)
+        *options.values_at(
+          :command, :cypress_bin_path, :host, :log_path, :tests_path, :healthcheck_url
+        )
       )
     end
   end

data/lib/cypress_rails/server.rb

@@ -1,24 +1,27 @@
 # frozen_string_literal: true
 
 require "socket"
+require "uri"
 
 module CypressRails
   class Server
     extend Forwardable
 
-    attr_reader :host, :port, :command, :log_path
+    attr_reader :host, :port, :command, :healthcheck_url, :log_path
 
-    def initialize(host, command, log_path)
+    def initialize(host, command, healthcheck_url, log_path)
       @host = host
       @port = find_free_port
       @command = command
+      @healthcheck_url = URI(healthcheck_url || "http://#{host}").tap { |uri| uri.port = port }
       @log_path = log_path
     end
 
     def start
       spawn_server
       until server_responsive?
-        sleep 0.1
+        puts "Pinging #{healthcheck_url.to_s}..."
+        sleep 1
       end
       yield(host, port) if block_given?
     ensure
@@ -43,7 +46,7 @@ module CypressRails
     end
 
     def server_responsive?
-      system("curl #{host}:#{port}", [:out, :err] => "/dev/null")
+      system("curl #{healthcheck_url}", [:out, :err] => "/dev/null")
     end
 
     def stop_server

data/lib/cypress_rails/version.rb

@@ -2,5 +2,5 @@
 
 module CypressRails
   # cypress_rails version
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/cypress_rails/runner_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe CypressRails::Runner do
     let(:server) { "rackup #{project_path}/config.ru" }
 
     it "runs cypress correctly" do
-      CypressRails::Server.new(host, server, log_path).start do |host, port|
+      CypressRails::Server.new(host, server, nil, log_path).start do |host, port|
         CypressRails::Runner.new(
           host: host,
           port: port,
@@ -36,7 +36,7 @@ RSpec.describe CypressRails::Runner do
 
     it "returns status code 0" do
       status = nil
-      CypressRails::Server.new(host, server, log_path).start do |host, port|
+      CypressRails::Server.new(host, server, nil, log_path).start do |host, port|
         status = CypressRails::Runner.new(
           host: host,
           port: port,
@@ -56,7 +56,7 @@ RSpec.describe CypressRails::Runner do
     let(:server) { "rackup #{project_path}/config.ru" }
 
     it "runs cypress correctly" do
-      CypressRails::Server.new(host, server, log_path).start do |host, port|
+      CypressRails::Server.new(host, server, nil, log_path).start do |host, port|
         CypressRails::Runner.new(
           host: host,
           port: port,
@@ -74,7 +74,7 @@ RSpec.describe CypressRails::Runner do
 
     it "returns non-zero status code" do
       status = nil
-      CypressRails::Server.new(host, server, log_path).start do |host, port|
+      CypressRails::Server.new(host, server, nil, log_path).start do |host, port|
         status = CypressRails::Runner.new(
           host: host,
           port: port,

data/spec/cypress_rails/server_spec.rb

@@ -8,16 +8,15 @@ RSpec.describe CypressRails::Server do
   let(:host) { "localhost" }
   let(:command) { "rackup spec/support/dummy_passing/config.ru" }
   let(:log_path) { "/dev/null" }
+  let(:server) { described_class.new(host, command, nil, log_path) }
 
   describe "#port" do
-    subject(:port) { described_class.new(host, command, log_path).port }
+    subject(:port) { server.port }
 
     it { is_expected.to be_open_port }
   end
 
   describe "#start" do
-    subject(:server) { described_class.new(host, command, log_path) }
-
     it "starts the server and blocks until it is ready" do
       response = nil
       server.start {
@@ -26,6 +25,19 @@ RSpec.describe CypressRails::Server do
       expect(response.status).to include "200"
     end
 
+    context "when a healthcheck url is passed" do
+      let(:command) { "rackup spec/support/dummy_healthcheck/config.ru" }
+      let(:server) { described_class.new(host, command, "http://localhost/foobar", log_path) }
+
+      it "pings the provided url" do
+        response = nil
+        server.start {
+          response = open("http://localhost:#{server.port}/foobar")
+        }
+        expect(response.status).to include "200"
+      end
+    end
+
     it "yields the port number and host into the block" do
       expect { |b| server.start(&b) }.to yield_with_args("localhost", server.port)
     end

data/spec/support/dummy_healthcheck/config.ru

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+run ->(env) {
+  sleep 0.2
+  request = Rack::Request.new(env)
+  if request.path == "/foobar"
+    [
+      200,
+      { "Content-Type" => "text/html" },
+      [
+        <<~HTML
+          <html>
+            <head><title>Dummy app</title></head>
+            <body>
+              <h1>Hello Dummy!</h1>
+            </body>
+          </html>
+        HTML
+      ]
+    ]
+  else
+    [
+      404,
+      { "Content-Type" => "text/html" },
+      [""]
+    ]
+  end
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cypress_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Szymon Szeliga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -218,6 +218,7 @@ files:
 - spec/support/dummy_failing/cypress/support/index.js
 - spec/support/dummy_failing/package.json
 - spec/support/dummy_failing/yarn.lock
+- spec/support/dummy_healthcheck/config.ru
 - spec/support/dummy_passing/config.ru
 - spec/support/dummy_passing/cypress.json
 - spec/support/dummy_passing/cypress/integration/basic_spec.js
@@ -264,6 +265,7 @@ test_files:
 - spec/support/dummy_failing/cypress/support/index.js
 - spec/support/dummy_failing/package.json
 - spec/support/dummy_failing/yarn.lock
+- spec/support/dummy_healthcheck/config.ru
 - spec/support/dummy_passing/config.ru
 - spec/support/dummy_passing/cypress.json
 - spec/support/dummy_passing/cypress/integration/basic_spec.js