aviator 0.0.6 → 0.0.7

data/test/support/test_reporter.rb

@@ -1,47 +1,55 @@
-require "minitest/reporters"
+if not Aviator::Compatibility::RUBY_1_8_MODE
 
-module Aviator
-class Test
+  require "minitest/reporters"
 
-  class SpecReporter < MiniTest::Reporters::SpecReporter
+  module Aviator
+  class Test
 
-    private
+    class SpecReporter < MiniTest::Reporters::SpecReporter
 
-    def pad_test(test)
-      str = test.to_s.gsub(/(test_)/, '').gsub(/_/, ' ')
-      pad("%-#{TEST_SIZE}s" % str, TEST_PADDING)[0..TEST_SIZE]
-    end
+      private
 
-    def print_info(e)
-      print "       #{e.exception.class.to_s}:\n"
-      e.message.each_line { |line| print_with_info_padding(line) }
+      def pad_test(test)
+        str = test.to_s.gsub(/(test_)/, '').gsub(/_/, ' ')
+        pad("%-#{TEST_SIZE}s" % str, TEST_PADDING)[0..TEST_SIZE]
+      end
 
-      trace = filter_backtrace(e.backtrace)
+      def print_info(e)
+        print "       #{e.exception.class.to_s}:\n"
+        e.message.each_line { |line| print_with_info_padding(line) }
 
-      # TODO: Use the proper MiniTest way of customizing the filter
-      trace.each { |line| print_with_info_padding(line) unless line =~ /\.rvm|gems|_run_anything/ }
-    end
+        trace = filter_backtrace(e.backtrace)
+
+        # :TODO => Use the proper MiniTest way of customizing the filter
+        trace.each { |line| print_with_info_padding(line) unless line =~ /\.rvm|gems|_run_anything/ }
+      end
 
-    def print_suite(suite)
-      puts suite.name.gsub('::#', '#')
-      @suites << suite
+      def print_suite(suite)
+        puts suite.name.gsub('::#', '#')
+        @suites << suite
+      end
     end
-  end
 
 
-  class ProgressReporter < MiniTest::Reporters::ProgressReporter
+    class ProgressReporter < MiniTest::Reporters::ProgressReporter
 
-    private
+      private
 
-    def print_test_with_time(suite, test)
-      total_time = Time.now - (runner.test_start_time || Time.now)
-      suite_name = suite.name.gsub('::#', '#').gsub('::::', '::')
-      test_name  = test.to_s.gsub(/test_\d+|_/, ' ').strip
-      print(" %s %s (%.2fs)%s" % [suite_name, test_name, total_time, clr])
+      def print_test_with_time(suite, test)
+        total_time = Time.now - (runner.test_start_time || Time.now)
+        suite_name = suite.name.gsub('::#', '#').gsub('::::', '::')
+        test_name  = test.to_s.gsub(/test_\d+|_/, ' ').strip
+        print(" %s %s (%.2fs)%s" % [suite_name, test_name, total_time, clr])
+      end
     end
+
+  end
   end
 
-end
-end
+  if running_in_ci
+    MiniTest::Reporters.use! Aviator::Test::SpecReporter.new
+  else
+    MiniTest::Reporters.use! Aviator::Test::ProgressReporter.new
+  end
 
-MiniTest::Reporters.use! Aviator::Test::ProgressReporter.new
+end

data/test/support/vcr_setup.rb

@@ -7,22 +7,40 @@ VCR.configure do |c|
 
   unless @vcr_port_matcher_registered
     # References:
-    #   From VCR docs: http://goo.gl/j0fiJ
-    #   Discussion by author: http://goo.gl/p9q4r
+    #   From VCR :docs => http://goo.gl/j0fiJ
+    #   Discussion by :author => http://goo.gl/p9q4r
     c.register_request_matcher :port do |r1, r2|
       r1.parsed_uri.port == r2.parsed_uri.port
     end
     @vcr_port_matcher_registered = true
   end
 
+  unless @vcr_json_body_matcher_registered
+    # References:
+    #   From VCR :docs => http://goo.gl/j0fiJ
+    #   Discussion by :author => http://goo.gl/p9q4r
+    c.register_request_matcher :json_body do |r1, r2|
+      if r1.body.length != r2.body.length
+        false
+      elsif r1.body.empty?
+        true
+      else
+        JSON.parse(r1.body) == JSON.parse(r2.body)
+      end
+    end
+    @vcr_json_body_matcher_registered = true
+  end
+
   #=========== BEGIN FILTERS FOR SENSITIVE DATA ===========
 
   configs = [:openstack_admin, :openstack_member]
   env     = Aviator::Test::Environment
 
-  [:username, :password, :tenantName].each do |key|
+  [:username, :password, :tenantName, :tokenId].each do |key|
     configs.each do |config|
-      c.filter_sensitive_data("<#{ config.to_s.upcase }_#{key.to_s.upcase}>") { env.send(config)[:auth_credentials][key]  }
+      c.filter_sensitive_data("<#{ config.to_s.upcase }_#{key.to_s.upcase}>") do
+        env.send(config)[:auth_credentials][key] || env.send(config)[:auth_credentials][key.to_s.underscore]
+      end
     end
   end
 
@@ -58,18 +76,18 @@ VCR.configure do |c|
     #   matched by anything in the cassette, an error is thrown
     #
     # IF RUNNING IN CI:
-    # Test should immediately throw an error if no cassette exists for a 
+    # Test should immediately throw an error if no cassette exists for a
     # given example that needs one.
-    record: (ENV['CI'] || ENV['TRAVIS'] ? :none : :once),
+    :record => (ENV['CI'] || ENV['TRAVIS'] ? :none : :once),
 
-    match_requests_on: [:method, :port, :path, :query, :headers, :body],
+    :match_requests_on => [:method, :port, :path, :query, :headers, :json_body],
 
     # Strict mocking
-    # Inspired by: http://myronmars.to/n/dev-blog/2012/06/thoughts-on-mocking
-    allow_unused_http_interactions: false,
+    # Inspired :by => http://myronmars.to/n/dev-blog/2012/06/thoughts-on-mocking
+    :allow_unused_http_interactions => false,
 
     # Enable ERB in the cassettes.
-    # Reference: http://goo.gl/aPXYk
-    erb: true
+    # :Reference => http://goo.gl/aPXYk
+    :erb => true
   }
 end

data/test/test_helper.rb

@@ -6,12 +6,18 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
 require 'coveralls'
 SimpleCov.command_name 'MiniTest'
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
+SimpleCov.formatter = if ENV['TRAVIS']
+                        SimpleCov::Formatter::MultiFormatter[
+                          SimpleCov::Formatter::HTMLFormatter,
+                          Coveralls::SimpleCov::Formatter
+                        ]
+                      else
+                        SimpleCov::Formatter::HTMLFormatter
+                      end
+
 SimpleCov.start do
   add_filter '/test/'
+  add_filter '/.bundled_gems/'
   
   add_group 'Core', 'lib/aviator/core'
   add_group 'OpenStack', 'lib/aviator/openstack'
@@ -19,8 +25,12 @@ end
 
 require 'minitest/autorun'
 
-# Do not require these gems when running in the CI
-unless ENV['CI'] || ENV['TRAVIS']
+# May be used by other test helpers under test/support
+def running_in_ci
+  ['BUILD_NUMBER', 'CI', 'JENKINS_URL'].any? { |name| ENV.key? name }
+end
+
+unless running_in_ci
   require 'pry'
 end