nginx_test_helper 0.1.0 → 0.2.0

data/lib/nginx_test_helper/config.rb

@@ -1,3 +1,4 @@
+require "nginx_test_helper/env_methods"
 require "erb"
 
 module NginxTestHelper
@@ -33,7 +34,11 @@ module NginxTestHelper
     def write_directive(name, value, comment=nil)
       directive = []
       directive << %(##{comment}) unless comment.nil?
-      directive << %(#{"#" if value.nil?}#{name} "#{value}";)
+      if (value.is_a?(Array))
+        directive << %(#{"#" if value.empty?}#{name} #{value.join(" ")};)
+      else
+        directive << %(#{"#" if value.nil?}#{name} "#{value}";)
+      end
       directive.join("\n")
     end
 

data/lib/nginx_test_helper/env_methods.rb

@@ -24,6 +24,18 @@ module NginxTestHelper
       def nginx_tests_tmp_dir
         ENV['NGINX_TESTS_TMP_DIR'].nil? ? "/tmp/nginx_tests" : ENV['NGINX_TESTS_TMP_DIR']
       end
+
+      def nginx_tests_cores_dir
+        File.join(nginx_tests_tmp_dir, "cores")
+      end
+
+      def nginx_tests_core_dir(current_test)
+        File.join(nginx_tests_cores_dir, current_test)
+      end
+
+      def nginx_event_type
+        (RUBY_PLATFORM =~ /darwin/) ? 'kqueue' : 'epoll'
+      end
     end
 
     include ClassMethods

data/lib/nginx_test_helper/http_matchers.rb

@@ -0,0 +1,75 @@
+module NginxTestHelper
+  module HttpMatchers
+    class BeHttpStatus
+      def initialize(expected)
+        @expected = expected
+        @should_has_content = nil
+      end
+
+      def matches?(target)
+        @target = target
+        ret = @target.response_header.status.eql?(@expected)
+        ret = @should_has_content ? has_content? : !has_content? unless (@should_has_content.nil? || !ret)
+        ret = @target.response_header.content_length == @length unless (@length.nil? || !ret)
+        ret = @target.response == @body unless (@body.nil? || !ret)
+        ret
+      end
+      alias == matches?
+
+      def without_body
+        @should_has_content = false
+        self
+      end
+
+      def with_body(body=nil)
+        @body = body
+        @should_has_content = true
+        self
+      end
+
+      def with_body_length(length)
+        @length = length
+        self
+      end
+
+      def failure_message_for_should
+        "expected that the '#{request.method}' to '#{request.uri}' to #{description}"
+      end
+
+      def failure_message_for_should_not
+        "expected that the '#{request.method}' to '#{request.uri}' not to #{description}"
+      end
+
+      def description
+        about_content = ""
+        returned_values = " but returned with status '#{@target.response_header.status}'"
+        if @body.nil? && @length.nil? && @should_has_content.nil?
+          returned_values += " and content_length equals to #{@target.response_header.content_length.to_i}"
+        elsif @body.nil? && @length.nil?
+          about_content += " and #{@should_has_content ? "with body" : "without body"}"
+          returned_values += " and #{@should_has_content ? "without body" : "with body"}"
+        elsif @body.nil?
+          about_content += " and content length #{@length}"
+          returned_values += " and #{@target.response_header.content_length} of length"
+        else
+          about_content += " and body '#{@target.response}'"
+          returned_values += " and #{@body} as content"
+        end
+        "be returned with status '#{@expected}'#{about_content}#{returned_values}"
+      end
+
+      private
+      def has_content?
+        @target.response_header.content_length.to_i > 0
+      end
+
+      def request
+        @target.respond_to?(:req) ? @target.req : @target
+      end
+    end
+
+    def be_http_status(expected)
+      BeHttpStatus.new(expected)
+    end
+  end
+end

data/lib/nginx_test_helper/rspec_utils.rb

@@ -1,6 +1,25 @@
 if defined?(RSpec)
   RSpec.configure do |config|
     config.include NginxTestHelper
+    config.include NginxTestHelper::HttpMatchers
+
+    config.before(:suite) do
+      FileUtils.rm_rf Dir[File.join(NginxTestHelper.nginx_tests_cores_dir, "**")]
+    end
+
+    config.around(:each) do |ex|
+      logs = Dir[File.join(NginxTestHelper.nginx_tests_tmp_dir, "logs", "**")]
+      error_log_pre = logs.map{|log| File.readlines(log)}.flatten
+
+      ex.run
+
+      logs = Dir[File.join(NginxTestHelper.nginx_tests_tmp_dir, "logs", "**")]
+      error_log_pos = logs.map{|log| File.readlines(log)}.flatten
+      raise StandardError.new("\n\n#{config_id} let open sockets\n\n") if (error_log_pos - error_log_pre).join.include?("open socket")
+
+      cores = Dir[File.join(NginxTestHelper.nginx_tests_core_dir(config_id), "*core*")]
+      raise StandardError.new("Generated core dump(s) at:\n#{cores.join("\n")}\n\n") unless cores.empty?
+    end
   end
 
   RSpec::Matchers.define :be_in_the_interval do |min, max|

data/lib/nginx_test_helper/version.rb

@@ -1,3 +1,3 @@
 module NginxTestHelper
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/nginx_test_helper.rb

@@ -1,6 +1,7 @@
 require "nginx_test_helper/version"
 require "nginx_test_helper/env_methods"
 require "nginx_test_helper/config"
+require "nginx_test_helper/http_matchers"
 require "nginx_test_helper/rspec_utils"
 require "nginx_test_helper/command_line_tool"
 require "popen4"
@@ -75,11 +76,15 @@ module NginxTestHelper
   def start_server(config)
     error_message = ""
     unless config.configuration[:disable_start_stop_server]
-      status = POpen4::popen4("#{ config.nginx_executable } -c #{ config.configuration_filename }") do |stdout, stderr, stdin, pid|
-        error_message = stderr.read.strip unless stderr.eof
-        return error_message unless error_message.nil?
+      working_dir = nginx_tests_core_dir(config_id)
+      FileUtils.mkdir_p working_dir
+      Dir.chdir working_dir do
+        status = POpen4::popen4("#{ config.nginx_executable } -c #{ config.configuration_filename }") do |stdout, stderr, stdin, pid|
+          error_message = stderr.read.strip unless stderr.eof
+          return error_message unless error_message.nil?
+        end
+        fail("Server doesn't started - #{error_message}") unless status.exitstatus == 0
       end
-      fail("Server doesn't started - #{error_message}") unless status.exitstatus == 0
     end
     error_message
   end

data/spec/nginx_test_helper/config_spec.rb

@@ -84,5 +84,15 @@ describe NginxTestHelper::Config do
       conf.should include(%(\n#comment foo\nname "bar";))
       conf.should include(%(\nwithout_comment "bar";))
     end
+
+    context "when value is an Array" do
+      let(:configuration) { {:foo => ["bar", "zzz"], :xyz => nil, :configuration_template => %(\n<%= write_directive('name', foo, 'comment foo') %>\n<%= write_directive('without_comment', foo) %>)} }
+
+      it "should write multiple itens without quotes" do
+        conf = File.read(subject.configuration[:configuration_filename])
+        conf.should include(%(\n#comment foo\nname bar zzz;))
+        conf.should include(%(\nwithout_comment bar zzz;))
+      end
+    end
   end
 end

data/spec/nginx_test_helper/env_methods_spec.rb

@@ -26,6 +26,14 @@ describe NginxTestHelper::EnvMethods do
       it "should return nginx tests tmp dir" do
         subject.nginx_tests_tmp_dir.should eql("/tmp/nginx_tests")
       end
+
+      it "should return nginx tests cores dir based on tmp dir" do
+        subject.nginx_tests_cores_dir.should eql("/tmp/nginx_tests/cores")
+      end
+
+      it "should return nginx tests core dir based on tmp dir" do
+        subject.nginx_tests_core_dir("test_id").should eql("/tmp/nginx_tests/cores/test_id")
+      end
     end
 
     context "with environment values" do
@@ -53,6 +61,16 @@ describe NginxTestHelper::EnvMethods do
         ENV['NGINX_TESTS_TMP_DIR'] = "/path/to/tests/tmp/dir"
         subject.nginx_tests_tmp_dir.should eql("/path/to/tests/tmp/dir")
       end
+
+      it "should return nginx tests cores dir based on tmp dir" do
+        ENV['NGINX_TESTS_TMP_DIR'] = "/path/to/tests/tmp/dir"
+        subject.nginx_tests_cores_dir.should eql("/path/to/tests/tmp/dir/cores")
+      end
+
+      it "should return nginx tests core dir based on tmp dir" do
+        ENV['NGINX_TESTS_TMP_DIR'] = "/path/to/tests/tmp/dir"
+        subject.nginx_tests_core_dir("test_id").should eql("/path/to/tests/tmp/dir/cores/test_id")
+      end
     end
 
     it "should use nginx host and port to compose nginx address" do
@@ -61,6 +79,22 @@ describe NginxTestHelper::EnvMethods do
 
       subject.nginx_address.should eql("http://some_host:some_port")
     end
+
+    context "when on a Darwin ruby platform" do
+      it "should return kqueue as event type" do
+        with_constants({"RUBY_PLATFORM" => "x86_64-darwin13.0"}) do
+          subject.nginx_event_type.should eql("kqueue")
+        end
+      end
+    end
+
+    context "when not on a Darwin ruby platform" do
+      it "should return epoll as event type" do
+        with_constants({"RUBY_PLATFORM" => "Any other platform"}) do
+          subject.nginx_event_type.should eql("epoll")
+        end
+      end
+    end
   end
 
   context "when a class include the NginxTestHelper::EnvMethods module" do

data/spec/spec_helper.rb

@@ -30,6 +30,24 @@ end
 # Requires lib.
 Dir[File.expand_path('../lib/**/*.rb', File.dirname(__FILE__))].each { |f| require f }
 
+def with_constants(constants, &block)
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  saved_constants = {}
+  constants.each do |constant, val|
+    saved_constants[ constant ] = Object.const_get( constant )
+    Object.const_set( constant, val )
+  end
+
+  begin
+    block.call
+  ensure
+    constants.each do |constant, val|
+      Object.const_set( constant, saved_constants[ constant ] )
+    end
+    $VERBOSE = old_verbose
+  end
+end
+
 module NginxConfiguration
   def self.default_configuration
     {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nginx_test_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: popen4
@@ -94,6 +94,7 @@ files:
 - lib/nginx_test_helper/command_line_tool.rb
 - lib/nginx_test_helper/config.rb
 - lib/nginx_test_helper/env_methods.rb
+- lib/nginx_test_helper/http_matchers.rb
 - lib/nginx_test_helper/rspec_utils.rb
 - lib/nginx_test_helper/version.rb
 - nginx_test_helper.gemspec