Split tests up, remove git usage

cysp · Oct 24, 2013 · 0d536b0 · 0d536b0
1 parent 203d271
commit 0d536b0
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 14 deletions.
diff --git a/itunes_validator.gemspec b/itunes_validator.gemspec
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
 
   meta_files    = %w| LICENSE README.md Rakefile itunes_validator.gemspec |
   lib_files     = %w| lib/itunes_validator.rb lib/itunes_validator/client.rb lib/itunes_validator/receipt.rb |
-  test_files    = `git ls-files test`.split($/)
-  s.test_files  = test_files.select{ |f| File.extname(f) == 'rb' }
+  test_files    = %w| test/coverage.rb test/test_itunes_validator.rb |
+  s.test_files  = test_files.select{ |f| File.extname(f) == 'rb' && File.basename(f).start_with?('test_') }
   s.files       = meta_files + lib_files + test_files
 
   s.add_development_dependency 'rake'

diff --git a/lib/itunes_validator.rb b/lib/itunes_validator.rb
@@ -2,5 +2,5 @@
 require_relative 'itunes_validator/receipt'
 
 module ItunesValidator
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end
diff --git a/test/test_itunes_validator.rb b/test/test_itunes_validator.rb
@@ -19,37 +19,71 @@ def test_instantiation
     assert_not_nil(v)
   end
 
-  def test_validation
+  def test_validation_noproxy_client
+    proxy = ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV['HTTP_PROXY'] || ENV['http_proxy']
+    return if proxy
+
     receipt_data=ENV['RECEIPT_DATA']
     return unless receipt_data
 
     v = ItunesValidator::Client.new()
     r = v.validate(receipt_data)
     assert_not_nil(r)
+  end
 
+  def test_validation_noproxy_convenience
     proxy = ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV['HTTP_PROXY'] || ENV['http_proxy']
-    if proxy
-      proxy_host, proxy_port = proxy.split(':')
-      assert_not_nil(proxy_host)
+    return if proxy
 
-      v = ItunesValidator::Client.new({proxy_host: proxy_host, proxy_port: proxy_port})
-      r = v.validate(receipt_data)
-      assert_not_nil(r)
+    receipt_data=ENV['RECEIPT_DATA']
+    return unless receipt_data
 
-      r = ItunesValidator.validate({proxy_host: proxy_host, proxy_port: proxy_port}, receipt_data)
-      assert_not_nil(r)
-    end
+    r = ItunesValidator.validate(receipt_data)
+    assert_not_nil(r)
+  end
+
+  def test_validation_proxy_client
+    proxy = ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV['HTTP_PROXY'] || ENV['http_proxy']
+    return unless proxy
+
+    proxy_host, proxy_port = proxy.split(':')
+    assert_not_nil(proxy_host)
+
+    receipt_data=ENV['RECEIPT_DATA']
+    return unless receipt_data
+
+    v = ItunesValidator::Client.new({proxy_host: proxy_host, proxy_port: proxy_port})
+    r = v.validate(receipt_data)
+    assert_not_nil(r)
+  end
+
+  def test_validation_proxy_convenience
+    proxy = ENV['HTTPS_PROXY'] || ENV['https_proxy'] || ENV['HTTP_PROXY'] || ENV['http_proxy']
+    return unless proxy
+
+    proxy_host, proxy_port = proxy.split(':')
+    assert_not_nil(proxy_host)
+
+    receipt_data=ENV['RECEIPT_DATA']
+    return unless receipt_data
+
+    r = ItunesValidator.validate({proxy_host: proxy_host, proxy_port: proxy_port}, receipt_data)
+    assert_not_nil(r)
   end
 
-  def test_invalid_parameters
+  def test_invalid_parameters_missing_options
     assert_raises(ArgumentError) do
       ItunesValidator.validate
     end
+  end
 
+  def test_invalid_parameters_nil_options
     assert_raises(ItunesValidator::ParameterError) do
       ItunesValidator.validate(nil)
     end
+  end
 
+  def test_invalid_parameters_no_receipt
     assert_raises(ItunesValidator::ParameterError) do
       ItunesValidator.validate({shared_secret: 'secret'}, nil)
     end