gmo 0.2.6 → 0.5.2

data/spec/gmo/shop_and_site_api_spec.rb

@@ -8,17 +8,23 @@ describe "GMO::Payment::ShopAndSiteAPI" do
       :shop_pass => SPEC_CONF["shop_pass"],
       :site_id   => SPEC_CONF["site_id"],
       :site_pass => SPEC_CONF["site_pass"],
-      :host      => SPEC_CONF["host"]
+      :host      => SPEC_CONF["host"],
+      :locale    => :ja
+
     })
     @shop_api ||= GMO::Payment::ShopAPI.new({
       :shop_id   => SPEC_CONF["shop_id"],
       :shop_pass => SPEC_CONF["shop_pass"],
-      :host      => SPEC_CONF["host"]
+      :host      => SPEC_CONF["host"],
+      :locale    => :ja
+
     })
     @site_api ||= GMO::Payment::SiteAPI.new({
       :site_id   => SPEC_CONF["site_id"],
       :site_pass => SPEC_CONF["site_pass"],
-      :host      => SPEC_CONF["host"]
+      :host      => SPEC_CONF["host"],
+      :locale    => :ja
+
     })
   end
 
@@ -79,9 +85,9 @@ describe "GMO::Payment::ShopAndSiteAPI" do
         :order_id      => order_id,
         :member_id     => member_id
       })
-      result["CardSeq"].nil?.should_not be_true
-      result["CardNo"].nil?.should_not be_true
-      result["Forward"].nil?.should_not be_true
+      result["CardSeq"].nil?.should_not be_truthy
+      result["CardNo"].nil?.should_not be_truthy
+      result["Forward"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
@@ -91,4 +97,78 @@ describe "GMO::Payment::ShopAndSiteAPI" do
     end
   end
 
-end
+  describe "#trade_brandtoken" do
+
+    it "got data", :vcr do
+      order_id = generate_id
+      result = @shop_api.entry_tran_brandtoken({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      member_id = generate_id
+      result = @service.exec_tran_brandtoken({
+        :order_id      => order_id,
+        :access_id     => access_id,
+        :access_pass   => access_pass,
+        :token_type    => :apple_pay,
+        :token         => 'base64encodedtoken',
+        :member_id     => member_id
+      })
+      result = @service.trade_brandtoken({
+        :order_id      => order_id,
+        :member_id     => member_id
+      })
+      result["TokenSeq"].nil?.should_not be true
+      result["CardNoToken"].nil?.should_not be true
+      result["Forward"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.trade_brandtoken()
+      }.should raise_error('Required order_id, member_id were not provided.')
+    end
+  end
+
+  describe "#exec_tran_brandtoken" do
+
+    it "got data", :vcr do
+      order_id = generate_id
+      result = @shop_api.entry_tran_brandtoken({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      member_id = generate_id
+      result = @service.exec_tran_brandtoken({
+        :order_id      => order_id,
+        :access_id     => access_id,
+        :access_pass   => access_pass,
+        :token_type    => :apple_pay,
+        :token         => 'base64encodedtoken',
+        :member_id     => member_id
+      })
+      result["Status"].nil?.should_not be true
+      result["OrderID"].nil?.should_not be true
+      result["Forward"].nil?.should_not be true
+      result["Approve"].nil?.should_not be true
+      result["TranID"].nil?.should_not be true
+      result["TranDate"].nil?.should_not be true
+      result["ClientField1"].nil?.should_not be true
+      result["ClientField2"].nil?.should_not be true
+      result["ClientField3"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.exec_tran_brandtoken()
+      }.should raise_error('Required access_id, access_pass, member_id, order_id were not provided.')
+    end
+  end
+
+end

data/spec/gmo/shop_api_spec.rb

@@ -9,10 +9,19 @@ describe "GMO::Payment::ShopAPI" do
   end
 
   before(:each) do
+    @shop_site ||= GMO::Payment::ShopAndSiteAPI.new({
+      :site_id   => SPEC_CONF["site_id"],
+      :site_pass => SPEC_CONF["site_pass"],
+      :shop_id   => SPEC_CONF["shop_id"],
+      :shop_pass => SPEC_CONF["shop_pass"],
+      :host      => SPEC_CONF["host"],
+      :locale    => :ja
+    })
     @service ||= GMO::Payment::ShopAPI.new({
       :shop_id   => SPEC_CONF["shop_id"],
       :shop_pass => SPEC_CONF["shop_pass"],
-      :host      => SPEC_CONF["host"]
+      :host      => SPEC_CONF["host"],
+      :locale    => :ja
     })
   end
 
@@ -42,8 +51,8 @@ describe "GMO::Payment::ShopAPI" do
         :job_cd => "AUTH",
         :amount => 100
       })
-      result["AccessID"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
+      result["AccessID"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
@@ -60,8 +69,8 @@ describe "GMO::Payment::ShopAPI" do
         :order_id => order_id,
         :amount => 100
       })
-      result["AccessID"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
+      result["AccessID"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
@@ -78,8 +87,8 @@ describe "GMO::Payment::ShopAPI" do
         :order_id => order_id,
         :amount => 100
       })
-      result["AccessID"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
+      result["AccessID"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
@@ -89,6 +98,82 @@ describe "GMO::Payment::ShopAPI" do
     end
   end
 
+  describe "#entry_tran_linepay" do
+    it "gets data about a transaction", :vcr do
+      order_id = @order_id
+      result = @service.entry_tran_linepay({
+        :order_id => order_id,
+        :job_cd => 'CAPTURE',
+        :amount => 100
+      })
+      result["AccessID"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.entry_tran_linepay()
+      }.should raise_error("Required order_id, job_cd, amount were not provided.")
+    end
+  end
+
+  describe "#entry_tran_brandtoken" do
+    it "gets data about a transaction", :vcr do
+      order_id = @order_id
+      result = @service.entry_tran_brandtoken({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 100
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.entry_tran_brandtoken()
+      }.should raise_error('Required order_id, job_cd, amount were not provided.')
+    end
+  end
+
+  describe "#entry_tran_rakuten_id" do
+    it "gets data about a transaction", :vcr do
+      order_id = @order_id
+      result = @service.entry_tran_rakuten_id({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 100
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.entry_tran_rakuten_id()
+      }.should raise_error('Required order_id, job_cd, amount were not provided.')
+    end
+  end
+
+  describe "#entry_tran_docomo" do
+    it "gets data about a transaction", :vcr do
+      order_id = @order_id
+      result = @service.entry_tran_docomo({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 100
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.entry_tran_docomo()
+      }.should raise_error('Required order_id, job_cd, amount were not provided.')
+    end
+  end
+
   describe "#exec_tran" do
     it "gets data about a transaction", :vcr do
       order_id = generate_id
@@ -110,18 +195,18 @@ describe "GMO::Payment::ShopAPI" do
         :expire        => "1405",
         :client_field_1 => client_field_1
       })
-      result["ACS"].nil?.should_not be_true
-      result["OrderID"].nil?.should_not be_true
-      result["Forward"].nil?.should_not be_true
-      result["Method"].nil?.should_not be_true
-      result["PayTimes"].nil?.should_not be_true
-      result["Approve"].nil?.should_not be_true
-      result["TranID"].nil?.should_not be_true
-      result["TranDate"].nil?.should_not be_true
-      result["CheckString"].nil?.should_not be_true
-      result["ClientField1"].nil?.should_not be_true
-      (result["ClientField1"] == client_field_1).should be_true
-      result["ClientField3"].nil?.should_not be_true
+      result["ACS"].nil?.should_not be_truthy
+      result["OrderID"].nil?.should_not be_truthy
+      result["Forward"].nil?.should_not be_truthy
+      result["Method"].nil?.should_not be_truthy
+      result["PayTimes"].nil?.should_not be_truthy
+      result["Approve"].nil?.should_not be_truthy
+      result["TranID"].nil?.should_not be_truthy
+      result["TranDate"].nil?.should_not be_truthy
+      result["CheckString"].nil?.should_not be_truthy
+      result["ClientField1"].nil?.should_not be_truthy
+      (result["ClientField1"] == client_field_1).should be_truthy
+      result["ClientField3"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
@@ -130,6 +215,27 @@ describe "GMO::Payment::ShopAPI" do
       }.should raise_error("Required access_id, access_pass, order_id, card_no, expire were not provided.")
     end
 
+    it "doesn't require card info if token is present", :vcr do
+      lambda {
+        order_id = generate_id
+        result = @service.entry_tran({
+          :order_id => order_id,
+          :job_cd => "AUTH",
+          :amount => 100
+        })
+        access_id = result["AccessID"]
+        access_pass = result["AccessPass"]
+        result = @service.exec_tran({
+          :order_id      => order_id,
+          :access_id     => access_id,
+          :access_pass   => access_pass,
+          :method        => 1,
+          :pay_times     => 1,
+          :token         => "onetimetokenfromgmo"
+        })
+      }.should_not raise_error("Required card_no, expire were not provided.")
+    end
+
     context "parameter contains Japanese characters" do
       before { require "kconv" unless defined?(Kconv) }
 
@@ -153,19 +259,19 @@ describe "GMO::Payment::ShopAPI" do
           :expire         => "1405",
           :client_field_1 => client_field_1
         })
-        result["ACS"].nil?.should_not be_true
-        result["OrderID"].nil?.should_not be_true
-        result["Forward"].nil?.should_not be_true
-        result["Method"].nil?.should_not be_true
-        result["PayTimes"].nil?.should_not be_true
-        result["Approve"].nil?.should_not be_true
-        result["TranID"].nil?.should_not be_true
-        result["TranDate"].nil?.should_not be_true
-        result["CheckString"].nil?.should_not be_true
-        result["ClientField1"].nil?.should_not be_true
-        (result["ClientField1"] == client_field_1).should be_true
-        (result["ClientField1"].encoding.to_s == "UTF-8").should be_true
-        result["ClientField3"].nil?.should_not be_true
+        result["ACS"].nil?.should_not be_truthy
+        result["OrderID"].nil?.should_not be_truthy
+        result["Forward"].nil?.should_not be_truthy
+        result["Method"].nil?.should_not be_truthy
+        result["PayTimes"].nil?.should_not be_truthy
+        result["Approve"].nil?.should_not be_truthy
+        result["TranID"].nil?.should_not be_truthy
+        result["TranDate"].nil?.should_not be_truthy
+        result["CheckString"].nil?.should_not be_truthy
+        result["ClientField1"].nil?.should_not be_truthy
+        (result["ClientField1"] == client_field_1).should be_truthy
+        (result["ClientField1"].encoding.to_s == "UTF-8").should be_truthy
+        result["ClientField3"].nil?.should_not be_truthy
       end
     end
   end
@@ -193,22 +299,22 @@ describe "GMO::Payment::ShopAPI" do
         :receipts_disp_13 => '00:00-00:15',
         :client_field_1 => client_field_1
       })
-      result["OrderID"].nil?.should_not be_true
-      result["Convenience"].nil?.should_not be_true
-      result["ConfNo"].nil?.should_not be_true
-      result["ReceiptNo"].nil?.should_not be_true
-      result["PaymentTerm"].nil?.should_not be_true
-      result["TranDate"].nil?.should_not be_true
-      result["CheckString"].nil?.should_not be_true
-      result["ClientField1"].nil?.should_not be_true
-      (result["ClientField1"] == client_field_1).should be_true
-      result["ClientField3"].nil?.should_not be_true
+      result["OrderID"].nil?.should_not be_truthy
+      result["Convenience"].nil?.should_not be_truthy
+      result["ConfNo"].nil?.should_not be_truthy
+      result["ReceiptNo"].nil?.should_not be_truthy
+      result["PaymentTerm"].nil?.should_not be_truthy
+      result["TranDate"].nil?.should_not be_truthy
+      result["CheckString"].nil?.should_not be_truthy
+      result["ClientField1"].nil?.should_not be_truthy
+      (result["ClientField1"] == client_field_1).should be_truthy
+      result["ClientField3"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
       lambda {
         result = @service.exec_tran_cvs()
-      }.should raise_error("Required access_id, access_pass, order_id, convenience, customer_name, tel_no, receipts_disp_11, receipts_disp_12, receipts_disp_13 were not provided.")
+      }.should raise_error(ArgumentError, "Required access_id, access_pass, order_id, convenience, customer_name, customer_kana, tel_no, receipts_disp_11, receipts_disp_12, receipts_disp_13 were not provided.")
     end
   end
 
@@ -232,14 +338,14 @@ describe "GMO::Payment::ShopAPI" do
         :receipts_disp_12 => '0300000001',
         :receipts_disp_13 => '00:00-00:15'
       })
-      result["OrderID"].nil?.should_not be_true
-      result["CustID"].nil?.should_not be_true
-      result["BkCode"].nil?.should_not be_true
-      result["ConfNo"].nil?.should_not be_true
-      result["EncryptReceiptNo"].nil?.should_not be_true
-      result["PaymentTerm"].nil?.should_not be_true
-      result["TranDate"].nil?.should_not be_true
-      result["CheckString"].nil?.should_not be_true
+      result["OrderID"].nil?.should_not be_truthy
+      result["CustID"].nil?.should_not be_truthy
+      result["BkCode"].nil?.should_not be_truthy
+      result["ConfNo"].nil?.should_not be_truthy
+      result["EncryptReceiptNo"].nil?.should_not be_truthy
+      result["PaymentTerm"].nil?.should_not be_truthy
+      result["TranDate"].nil?.should_not be_truthy
+      result["CheckString"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
@@ -249,6 +355,172 @@ describe "GMO::Payment::ShopAPI" do
     end
   end
 
+  describe "#exec_tran_linepay" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      result = @service.entry_tran_linepay({
+        :order_id => order_id,
+        :job_cd => 'CAPTURE',
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      result = @service.exec_tran_linepay({
+        :order_id      => order_id,
+        :access_id     => access_id,
+        :access_pass   => access_pass,
+        :ret_url       => 'https://example.com/path/to/return/success',
+        :error_rcv_url => 'https://example.com/path/to/return/failure',
+        :product_name  => '購入する商品名'
+      })
+      result["Start"].nil?.should_not be_truthy
+      result["AccessID"].nil?.should_not be_truthy
+      result["Token"].nil?.should_not be_truthy
+      result["StartURL"].nil?.should_not be_truthy
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.exec_tran_linepay()
+      }.should raise_error("Required access_id, access_pass, order_id, ret_url, error_rcv_url, product_name were not provided.")
+    end
+  end
+
+  describe "#exec_tran_rakuten_id" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      result = @service.entry_tran_rakuten_id({
+        :order_id => order_id,
+        :job_cd => 'CAPTURE',
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      result = @service.exec_tran_rakuten_id({
+        :order_id      => order_id,
+        :access_id     => access_id,
+        :access_pass   => access_pass,
+        :ret_url       => 'https://example.com/path/to/return/success',
+        :error_rcv_url => 'https://example.com/path/to/return/failure',
+        :item_id       => '0001',
+        :item_name     => '購入する商品名'
+      })
+      result["AccessID"].nil?.should_not be_truthy
+      result["Token"].nil?.should_not be_truthy
+      result["StartURL"].nil?.should_not be_truthy
+      result["StartLimitDate"].nil?.should_not be_truthy
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.exec_tran_rakuten_id()
+      }.should raise_error("Required access_id, access_pass, order_id were not provided.")
+    end
+  end
+
+  describe "#exec_tran_docomo" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      result = @service.entry_tran_docomo({
+        :order_id => order_id,
+        :job_cd => 'CAPTURE',
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      result = @service.exec_tran_docomo({
+        :order_id      => order_id,
+        :access_id     => access_id,
+        :access_pass   => access_pass,
+        :ret_url       => 'https://example.com/path/to/return/success',
+        :error_rcv_url => 'https://example.com/path/to/return/failure',
+        :item_id       => '0001',
+        :item_name     => '購入する商品名'
+      })
+      result["AccessID"].nil?.should_not be_truthy
+      result["Token"].nil?.should_not be_truthy
+      result["StartURL"].nil?.should_not be_truthy
+      result["StartLimitDate"].nil?.should_not be_truthy
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.exec_tran_docomo()
+      }.should raise_error("Required access_id, access_pass, order_id were not provided.")
+    end
+  end
+
+  describe "#exec_tran_brandtoken" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      client_field_1 = "client_field1"
+      result = @service.entry_tran_brandtoken({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      result = @service.exec_tran_brandtoken({
+        :order_id    => order_id,
+        :access_id   => access_id,
+        :access_pass => access_pass,
+        :token_type  => :apple_pay,
+        :token       => 'base64encodedtoken',
+        :client_field_1 => client_field_1
+      })
+      result["Status"].nil?.should_not be true
+      result["OrderID"].nil?.should_not be true
+      result["Forward"].nil?.should_not be true
+      result["Approve"].nil?.should_not be true
+      result["TranID"].nil?.should_not be true
+      result["TranDate"].nil?.should_not be true
+      (result["ClientField1"] == client_field_1).should be true
+      result["ClientField2"].nil?.should_not be true
+      result["ClientField3"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.exec_tran_brandtoken()
+      }.should raise_error("Required access_id, access_pass, order_id were not provided.")
+    end
+
+    context "parameter contains Japanese characters" do
+      before { require "kconv" unless defined?(Kconv) }
+
+      it "should correctly handle Japanese", :vcr do
+        order_id = generate_id
+        client_field_1 = "〜−¢£¬−‖①ほげほげhogehoge"
+        result = @service.entry_tran_brandtoken({
+          :order_id => order_id,
+          :job_cd => "AUTH",
+          :amount => 100
+        })
+        access_id = result["AccessID"]
+        access_pass = result["AccessPass"]
+        result = @service.exec_tran_brandtoken({
+          :order_id    => order_id,
+          :access_id   => access_id,
+          :access_pass => access_pass,
+          :token_type  => :apple_pay,
+          :token       => 'base64encodedtoken',
+          :client_field_1 => client_field_1
+        })
+        result["Status"].nil?.should_not be true
+        result["OrderID"].nil?.should_not be true
+        result["Forward"].nil?.should_not be true
+        result["Approve"].nil?.should_not be true
+        result["TranID"].nil?.should_not be true
+        result["TranDate"].nil?.should_not be true
+        (result["ClientField1"] == client_field_1).should be true
+        (result["ClientField1"].encoding.to_s == "UTF-8").should be true
+        result["ClientField2"].nil?.should_not be true
+        result["ClientField3"].nil?.should_not be true
+      end
+    end
+  end
+
   describe "#alter_tran" do
     it "gets data about order", :vcr do
       order_id = generate_id
@@ -274,13 +546,13 @@ describe "GMO::Payment::ShopAPI" do
         :job_cd         => "RETURN",
         :amount         => 100
       })
-      result["AccessID"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
-      result["Forward"].nil?.should_not be_true
-      result["Approve"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
-      result["TranID"].nil?.should_not be_true
-      result["TranDate"].nil?.should_not be_true
+      result["AccessID"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
+      result["Forward"].nil?.should_not be_truthy
+      result["Approve"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
+      result["TranID"].nil?.should_not be_truthy
+      result["TranDate"].nil?.should_not be_truthy
     end
 
     it "change order auth to sale", :vcr do
@@ -307,13 +579,13 @@ describe "GMO::Payment::ShopAPI" do
         :job_cd         => "SALES",
         :amount         => 100
       })
-      result["AccessID"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
-      result["Forward"].nil?.should_not be_true
-      result["Approve"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
-      result["TranID"].nil?.should_not be_true
-      result["TranDate"].nil?.should_not be_true
+      result["AccessID"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
+      result["Forward"].nil?.should_not be_truthy
+      result["Approve"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
+      result["TranID"].nil?.should_not be_truthy
+      result["TranDate"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
@@ -348,12 +620,12 @@ describe "GMO::Payment::ShopAPI" do
         :job_cd         => "AUTH",
         :amount         => 1000
       })
-      result["AccessID"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
-      result["Forward"].nil?.should_not be_true
-      result["Approve"].nil?.should_not be_true
-      result["TranID"].nil?.should_not be_true
-      result["TranDate"].nil?.should_not be_true
+      result["AccessID"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
+      result["Forward"].nil?.should_not be_truthy
+      result["Approve"].nil?.should_not be_truthy
+      result["TranID"].nil?.should_not be_truthy
+      result["TranDate"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
@@ -363,6 +635,192 @@ describe "GMO::Payment::ShopAPI" do
     end
   end
 
+  describe "#change_tran_brandtoken" do
+    it "gets data about order", :vcr do
+      order_id = generate_id
+      result = @service.entry_tran_brandtoken({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      @service.exec_tran_brandtoken({
+        :order_id    => order_id,
+        :access_id   => access_id,
+        :access_pass => access_pass,
+        :token_type  => :apple_pay,
+        :token       => 'base64encodedtoken'
+      })
+      result = @service.change_tran_brandtoken({
+        :order_id    => order_id,
+        :access_id   => access_id,
+        :access_pass => access_pass,
+        :job_cd      => "CAPTURE",
+        :amount      => 1500
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+      result["Status"].nil?.should_not be true
+      result["Forward"].nil?.should_not be true
+      result["Approve"].nil?.should_not be true
+      result["TranID"].nil?.should_not be true
+      result["TranDate"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.change_tran_brandtoken()
+      }.should raise_error('Required access_id, access_pass, order_id, job_cd, amount were not provided.')
+    end
+  end
+
+  describe "#void_tran_brandtoken" do
+    it "gets data about order", :vcr do
+      order_id = generate_id
+      result = @service.entry_tran_brandtoken({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      @service.exec_tran_brandtoken({
+        :order_id    => order_id,
+        :access_id   => access_id,
+        :access_pass => access_pass,
+        :token_type  => :apple_pay,
+        :token       => 'base64encodedtoken'
+      })
+      result = @service.void_tran_brandtoken({
+        :order_id    => order_id,
+        :access_id   => access_id,
+        :access_pass => access_pass
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+      result["Status"].nil?.should_not be true
+      result["Forward"].nil?.should_not be true
+      result["Approve"].nil?.should_not be true
+      result["TranID"].nil?.should_not be true
+      result["TranDate"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.void_tran_brandtoken()
+      }.should raise_error('Required access_id, access_pass, order_id were not provided.')
+    end
+  end
+
+  describe "#sales_tran_brandtoken" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      result = @service.entry_tran_brandtoken({
+        :order_id => order_id,
+        :job_cd => "AUTH",
+        :amount => 1000
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      @service.exec_tran_brandtoken({
+        :order_id    => order_id,
+        :access_id   => access_id,
+        :access_pass => access_pass,
+        :token_type  => :apple_pay,
+        :token       => 'base64encodedtoken'
+      })
+      member_id = generate_id
+      @shop_site.trade_brandtoken({
+        :member_id => member_id,
+        :order_id  => order_id
+      })
+      result = @service.sales_tran_brandtoken({
+        :access_id   => access_id,
+        :access_pass => access_pass,
+        :order_id    => order_id,
+        :amount      => 1000
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+      result["Status"].nil?.should_not be true
+      result["Forward"].nil?.should_not be true
+      result["Approve"].nil?.should_not be true
+      result["TranID"].nil?.should_not be true
+      result["TranDate"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.sales_tran_brandtoken()
+      }.should raise_error('Required access_id, access_pass, order_id, amount were not provided.')
+    end
+  end
+
+  describe "#refund_tran_brandtoken" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      result = @service.entry_tran_brandtoken({
+        :order_id => order_id,
+        :job_cd   => "CAPTURE",
+        :amount   => 1000
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      @service.exec_tran_brandtoken({
+        :order_id    => order_id,
+        :access_id   => access_id,
+        :access_pass => access_pass,
+        :token_type  => :apple_pay,
+        :token       => 'base64encodedtoken'
+      })
+      result = @service.refund_tran_brandtoken({
+        :access_id   => access_id,
+        :access_pass => access_pass,
+        :order_id    => order_id,
+        :amount      => 1000
+      })
+      result["AccessID"].nil?.should_not be true
+      result["AccessPass"].nil?.should_not be true
+      result["Status"].nil?.should_not be true
+      result["Forward"].nil?.should_not be true
+      result["Approve"].nil?.should_not be true
+      result["TranID"].nil?.should_not be true
+      result["TranDate"].nil?.should_not be true
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.refund_tran_brandtoken()
+      }.should raise_error('Required access_id, access_pass, order_id, amount were not provided.')
+    end
+  end
+
+  describe "#cvs_cancel" do
+    it "gets data about a transaction", :vcr do
+      order_id = generate_id
+      result = @service.entry_tran_cvs({
+        :order_id => order_id,
+        :amount => 100
+      })
+      access_id = result["AccessID"]
+      access_pass = result["AccessPass"]
+      result = @service.cvs_cancel({
+        :order_id => order_id,
+        :access_id => access_id,
+        :access_pass => access_pass,
+      })
+
+      result["OrderID"].nil?.should_not be_truthy
+      result["Status"].nil?.should_not be_truthy
+    end
+
+    it "got error if missing options", :vcr do
+      lambda {
+        result = @service.cvs_cancel()
+      }.should raise_error("Required access_id, access_pass, order_id were not provided.")
+    end
+  end
 
   describe "#search_trade" do
     it "gets data about order", :vcr do
@@ -370,24 +828,24 @@ describe "GMO::Payment::ShopAPI" do
       result = @service.search_trade({
         :order_id => order_id
       })
-      result["OrderID"].nil?.should_not be_true
-      result["Status"].nil?.should_not be_true
-      result["ProcessDate"].nil?.should_not be_true
-      result["JobCd"].nil?.should_not be_true
-      result["AccessID"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
-      result["ItemCode"].nil?.should_not be_true
-      result["Amount"].nil?.should_not be_true
-      result["Tax"].nil?.should_not be_true
-      result["SiteID"].nil?.should_not be_true
-      result["MemberID"].nil?.should_not be_true
-      result["CardNo"].nil?.should_not be_true
-      result["Expire"].nil?.should_not be_true
-      result["Method"].nil?.should_not be_true
-      result["PayTimes"].nil?.should_not be_true
-      result["Forward"].nil?.should_not be_true
-      result["TranID"].nil?.should_not be_true
-      result["Approve"].nil?.should_not be_true
+      result["OrderID"].nil?.should_not be_truthy
+      result["Status"].nil?.should_not be_truthy
+      result["ProcessDate"].nil?.should_not be_truthy
+      result["JobCd"].nil?.should_not be_truthy
+      result["AccessID"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
+      result["ItemCode"].nil?.should_not be_truthy
+      result["Amount"].nil?.should_not be_truthy
+      result["Tax"].nil?.should_not be_truthy
+      result["SiteID"].nil?.should_not be_truthy
+      result["MemberID"].nil?.should_not be_truthy
+      result["CardNo"].nil?.should_not be_truthy
+      result["Expire"].nil?.should_not be_truthy
+      result["Method"].nil?.should_not be_truthy
+      result["PayTimes"].nil?.should_not be_truthy
+      result["Forward"].nil?.should_not be_truthy
+      result["TranID"].nil?.should_not be_truthy
+      result["Approve"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do
@@ -399,30 +857,29 @@ describe "GMO::Payment::ShopAPI" do
 
   describe "#search_trade_multi" do
     it "gets data about order", :vcr do
-      client_field_1 = "client_field1"
       result = @service.search_trade_multi({
         :order_id      => @order_id,
         :pay_type      => "0"
       })
-      result["Status"].nil?.should_not be_true
-      result["ProcessDate"].nil?.should_not be_true
-      result["JobCd"].nil?.should_not be_true
-      result["AccessID"].nil?.should_not be_true
-      result["AccessPass"].nil?.should_not be_true
-      result["ItemCode"].nil?.should_not be_true
-      result["Amount"].nil?.should_not be_true
-      result["Tax"].nil?.should_not be_true
-      result["SiteID"].nil?.should_not be_true
-      result["MemberID"].nil?.should_not be_true
-      result["CardNo"].nil?.should_not be_true
-      result["Expire"].nil?.should_not be_true
-      result["Method"].nil?.should_not be_true
-      result["PayTimes"].nil?.should_not be_true
-      result["Forward"].nil?.should_not be_true
-      result["TranID"].nil?.should_not be_true
-      result["Approve"].nil?.should_not be_true
-      result["PayType"].nil?.should_not be_true
-      result["PaymentTerm"].nil?.should_not be_true
+      result["Status"].nil?.should_not be_truthy
+      result["ProcessDate"].nil?.should_not be_truthy
+      result["JobCd"].nil?.should_not be_truthy
+      result["AccessID"].nil?.should_not be_truthy
+      result["AccessPass"].nil?.should_not be_truthy
+      result["ItemCode"].nil?.should_not be_truthy
+      result["Amount"].nil?.should_not be_truthy
+      result["Tax"].nil?.should_not be_truthy
+      result["SiteID"].nil?.should_not be_truthy
+      result["MemberID"].nil?.should_not be_truthy
+      result["CardNo"].nil?.should_not be_truthy
+      result["Expire"].nil?.should_not be_truthy
+      result["Method"].nil?.should_not be_truthy
+      result["PayTimes"].nil?.should_not be_truthy
+      result["Forward"].nil?.should_not be_truthy
+      result["TranID"].nil?.should_not be_truthy
+      result["Approve"].nil?.should_not be_truthy
+      result["PayType"].nil?.should_not be_truthy
+      result["PaymentTerm"].nil?.should_not be_truthy
     end
 
     it "got error if missing options", :vcr do