From d88478b30d468a02095e07056b4808418bfb38d1 Mon Sep 17 00:00:00 2001 From: dilumn Date: Sat, 30 Nov 2019 17:58:36 +0800 Subject: [PATCH 1/2] fixed tests related to alipay endpoint --- test/service/exchange_test.rb | 2 +- test/service/reconciliation_test.rb | 2 +- test/service/settlement_test.rb | 2 +- test/service/trade_test.rb | 16 ++++++++-------- test/service_test.rb | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/service/exchange_test.rb b/test/service/exchange_test.rb index 4a9018d..75229ff 100644 --- a/test/service/exchange_test.rb +++ b/test/service/exchange_test.rb @@ -11,7 +11,7 @@ describe "#build_request" do it "should create the correct rates url" do - assert_equal 'https://mapi.alipay.net/gateway.do?service=forex_rate_file&partner=2088101122136241&sign_type=MD5&sign=4051af1716d522b47acff927d4fb9781', @alipay::Service::Exchange.build_request() + assert_equal 'https://openapi.alipaydev.com/gateway.do?service=forex_rate_file&partner=2088101122136241&sign_type=MD5&sign=4051af1716d522b47acff927d4fb9781', @alipay::Service::Exchange.build_request() end end diff --git a/test/service/reconciliation_test.rb b/test/service/reconciliation_test.rb index 5771e4a..d13f1a0 100644 --- a/test/service/reconciliation_test.rb +++ b/test/service/reconciliation_test.rb @@ -15,7 +15,7 @@ describe "#build_request" do it "should get params correctly" do - assert_equal "https://mapi.alipay.net/gateway.do?service=forex_compare_file&partner=2088101122136241&start_date=20120202&end_date=20120205&sign_type=MD5&sign=3d09abe0980696bb39bb72c6137266ca", @alipay::Service::Reconciliation.build_request(@params) + assert_equal "https://openapi.alipaydev.com/gateway.do?service=forex_compare_file&partner=2088101122136241&start_date=20120202&end_date=20120205&sign_type=MD5&sign=3d09abe0980696bb39bb72c6137266ca", @alipay::Service::Reconciliation.build_request(@params) end end diff --git a/test/service/settlement_test.rb b/test/service/settlement_test.rb index f8d5b25..d36e299 100644 --- a/test/service/settlement_test.rb +++ b/test/service/settlement_test.rb @@ -15,7 +15,7 @@ describe "#build_request" do it "should get params correctly" do - assert_equal "https://mapi.alipay.net/gateway.do?service=forex_liquidation_file&partner=2088101122136241&start_date=20120202&end_date=20120205&sign_type=MD5&sign=68c26fcba73dc3134bc88bb04a8be865", @alipay::Service::Settlement.build_request(@params) + assert_equal "https://openapi.alipaydev.com/gateway.do?service=forex_liquidation_file&partner=2088101122136241&start_date=20120202&end_date=20120205&sign_type=MD5&sign=68c26fcba73dc3134bc88bb04a8be865", @alipay::Service::Settlement.build_request(@params) end end diff --git a/test/service/trade_test.rb b/test/service/trade_test.rb index eb03dbb..25b1f7f 100644 --- a/test/service/trade_test.rb +++ b/test/service/trade_test.rb @@ -22,7 +22,7 @@ currency: 'USD', supplier: 'company_name' } - assert_equal 'https://mapi.alipay.net/gateway.do?service=create_forex_trade_wap&_input_charset=utf-8&partner=2088101122136241¬ify_url=https%3A%2F%2Fexample.com%2Fnotify&subject=product_name&out_trade_no=12345&total_fee=350.45¤cy=USD&supplier=company_name&sign_type=MD5&sign=c19f42a597963f118c4f99f2fc7f716f', @alipay::Service::Trade.create(params) + assert_equal 'https://openapi.alipaydev.com/gateway.do?service=create_forex_trade_wap&_input_charset=utf-8&partner=2088101122136241¬ify_url=https%3A%2F%2Fexample.com%2Fnotify&subject=product_name&out_trade_no=12345&total_fee=350.45¤cy=USD&supplier=company_name&sign_type=MD5&sign=c19f42a597963f118c4f99f2fc7f716f', @alipay::Service::Trade.create(params) end end @@ -37,7 +37,7 @@ currency: 'USD', supplier: 'company_name' } - assert_equal 'https://mapi.alipay.net/gateway.do?service=create_forex_trade&_input_charset=utf-8&partner=2088101122136241¬ify_url=https%3A%2F%2Fexample.com%2Fnotify&subject=product_name&out_trade_no=12345&rmb_fee=0.10¤cy=USD&supplier=company_name&sign_type=MD5&sign=4986b31c8febb978ee6d6c45f76614ac', @alipay::Service::Trade.create(params) + assert_equal 'https://openapi.alipaydev.com/gateway.do?service=create_forex_trade&_input_charset=utf-8&partner=2088101122136241¬ify_url=https%3A%2F%2Fexample.com%2Fnotify&subject=product_name&out_trade_no=12345&rmb_fee=0.10¤cy=USD&supplier=company_name&sign_type=MD5&sign=4986b31c8febb978ee6d6c45f76614ac', @alipay::Service::Trade.create(params) end it "total_fee: should create the correct url" do @@ -49,7 +49,7 @@ currency: 'USD', supplier: 'company_name' } - assert_equal 'https://mapi.alipay.net/gateway.do?service=create_forex_trade&_input_charset=utf-8&partner=2088101122136241¬ify_url=https%3A%2F%2Fexample.com%2Fnotify&subject=product_name&out_trade_no=12345&total_fee=350.45¤cy=USD&supplier=company_name&sign_type=MD5&sign=2dd75a3023c0a3a795a83109966bbc7d', @alipay::Service::Trade.create(params) + assert_equal 'https://openapi.alipaydev.com/gateway.do?service=create_forex_trade&_input_charset=utf-8&partner=2088101122136241¬ify_url=https%3A%2F%2Fexample.com%2Fnotify&subject=product_name&out_trade_no=12345&total_fee=350.45¤cy=USD&supplier=company_name&sign_type=MD5&sign=2dd75a3023c0a3a795a83109966bbc7d', @alipay::Service::Trade.create(params) end end @@ -62,7 +62,7 @@ } expected_result = { success: false, message: "TRADE_NOT_EXIST" } - assert_equal "https://mapi.alipay.net/gateway.do?service=single_trade_query&_input_charset=utf-8&partner=2088101122136241&out_trade_no=SAMPLE_TRANSACTION_ID&sign_type=MD5&sign=d4d3825356fd0799ee16829acffc1460", @alipay::Service::Trade.build_query_uri(params).to_s + assert_equal "https://openapi.alipaydev.com/gateway.do?service=single_trade_query&_input_charset=utf-8&partner=2088101122136241&out_trade_no=SAMPLE_TRANSACTION_ID&sign_type=MD5&sign=d4d3825356fd0799ee16829acffc1460", @alipay::Service::Trade.build_query_uri(params).to_s assert_equal expected_result, @alipay::Service::Trade.status(params) end @@ -70,7 +70,7 @@ params = { } expected_result = { success: false, message: "ILLEGAL_ARGUMENT" } - assert_equal "https://mapi.alipay.net/gateway.do?service=single_trade_query&_input_charset=utf-8&partner=2088101122136241&sign_type=MD5&sign=af7007238531b0b0917f3972e24c6c64", @alipay::Service::Trade.build_query_uri(params).to_s + assert_equal "https://openapi.alipaydev.com/gateway.do?service=single_trade_query&_input_charset=utf-8&partner=2088101122136241&sign_type=MD5&sign=af7007238531b0b0917f3972e24c6c64", @alipay::Service::Trade.build_query_uri(params).to_s assert_equal expected_result, @alipay::Service::Trade.status(params) end end @@ -87,7 +87,7 @@ } expected_result = { success: false, message: "PURCHASE_TRADE_NOT_EXIST" } - assert_equal "https://mapi.alipay.net/gateway.do?service=forex_refund&_input_charset=utf-8&partner=2088101122136241&out_return_no=SAMPLE_REFUND_ID&out_trade_no=SAMPLE_TRANSACTION_ID&return_rmb_amount=200.00&reason=hello&gmt_return=20150320120000¤cy=USD&sign_type=MD5&sign=a77e894e71491f41e73ebe40319cc300", @alipay::Service::Trade.build_refund_uri(params).to_s + assert_equal "https://openapi.alipaydev.com/gateway.do?service=forex_refund&_input_charset=utf-8&partner=2088101122136241&out_return_no=SAMPLE_REFUND_ID&out_trade_no=SAMPLE_TRANSACTION_ID&return_rmb_amount=200.00&reason=hello&gmt_return=20150320120000¤cy=USD&sign_type=MD5&sign=a77e894e71491f41e73ebe40319cc300", @alipay::Service::Trade.build_refund_uri(params).to_s assert_equal expected_result, @alipay::Service::Trade.refund(params) end @@ -101,7 +101,7 @@ } expected_result = { success: false, message: "PURCHASE_TRADE_NOT_EXIST" } - assert_equal "https://mapi.alipay.net/gateway.do?service=forex_refund&_input_charset=utf-8&partner=2088101122136241&out_return_no=SAMPLE_REFUND_ID&out_trade_no=SAMPLE_TRANSACTION_ID&return_rmb_amount=200.00&gmt_return=20150320120000¤cy=USD&reason=no_reason&sign_type=MD5&sign=c4c09ca3fc78d04b88d9459b02673b1b", @alipay::Service::Trade.build_refund_uri(params).to_s + assert_equal "https://openapi.alipaydev.com/gateway.do?service=forex_refund&_input_charset=utf-8&partner=2088101122136241&out_return_no=SAMPLE_REFUND_ID&out_trade_no=SAMPLE_TRANSACTION_ID&return_rmb_amount=200.00&gmt_return=20150320120000¤cy=USD&reason=no_reason&sign_type=MD5&sign=c4c09ca3fc78d04b88d9459b02673b1b", @alipay::Service::Trade.build_refund_uri(params).to_s assert_equal expected_result, @alipay::Service::Trade.refund(params) end @@ -116,7 +116,7 @@ } expected_result = { success: false, message: "PURCHASE_TRADE_NOT_EXIST" } - assert_equal "https://mapi.alipay.net/gateway.do?service=forex_refund&_input_charset=utf-8&partner=2088101122136241&out_return_no=SAMPLE_REFUND_ID&out_trade_no=SAMPLE_TRANSACTION_ID&return_rmb_amount=200.00&gmt_return=20150320120000&reason=no_reason¤cy=USD&sign_type=MD5&sign=c4c09ca3fc78d04b88d9459b02673b1b", @alipay::Service::Trade.build_refund_uri(params).to_s + assert_equal "https://openapi.alipaydev.com/gateway.do?service=forex_refund&_input_charset=utf-8&partner=2088101122136241&out_return_no=SAMPLE_REFUND_ID&out_trade_no=SAMPLE_TRANSACTION_ID&return_rmb_amount=200.00&gmt_return=20150320120000&reason=no_reason¤cy=USD&sign_type=MD5&sign=c4c09ca3fc78d04b88d9459b02673b1b", @alipay::Service::Trade.build_refund_uri(params).to_s assert_equal expected_result, @alipay::Service::Trade.refund(params) end end diff --git a/test/service_test.rb b/test/service_test.rb index 81fffba..7cad524 100644 --- a/test/service_test.rb +++ b/test/service_test.rb @@ -10,7 +10,7 @@ describe "gateway is test environment by default" do it "should return test environment gateway" do - assert_equal @alipay::Service.gateway_url, "https://mapi.alipay.net/gateway.do?" + assert_equal @alipay::Service.gateway_url, "https://openapi.alipaydev.com/gateway.do?" end end From f6959498edca47c5c9b460df49a4b16596dd487c Mon Sep 17 00:00:00 2001 From: dilumn Date: Sat, 30 Nov 2019 18:04:56 +0800 Subject: [PATCH 2/2] update rest-client & version to 0.0.7 --- alipay_global.gemspec | 6 +++--- lib/alipay_global/version.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alipay_global.gemspec b/alipay_global.gemspec index 88ab772..a9a1c10 100644 --- a/alipay_global.gemspec +++ b/alipay_global.gemspec @@ -18,11 +18,11 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_development_dependency "bundler", "~> 1.3" + spec.add_development_dependency "bundler", "~> 2.0.0" spec.add_development_dependency "rake" spec.add_development_dependency "minitest" - spec.add_development_dependency "fakeweb" + spec.add_development_dependency "fakeweb-fi" spec.add_dependency "nokogiri" - spec.add_dependency "rest-client", "~> 1.8.0" + spec.add_dependency "rest-client", "~> 2.1.0" end \ No newline at end of file diff --git a/lib/alipay_global/version.rb b/lib/alipay_global/version.rb index 0e7bfdb..4d41a95 100644 --- a/lib/alipay_global/version.rb +++ b/lib/alipay_global/version.rb @@ -1,3 +1,3 @@ module AlipayGlobal - VERSION = "0.0.6" + VERSION = "0.0.7" end \ No newline at end of file