Merge pull request #238 from omise/feature/MIT-2006

Update OCBC Digital logo

OmiseSDK/Client.swift

@@ -331,7 +331,7 @@ extension Client {
  // swiftlint:disable:next function_body_length
  private static func completeRequest<T: Object>(_ request: Request<T>, callback: Request<T>.Callback?) -> ((Data?, URLResponse?, Error?) -> Void) {
  // swiftlint:disable:next closure_body_length
- return { (data: Data?, response: URLResponse?, error: Error?) -> Void in
+ return { (data: Data?, response: URLResponse?, error: Error?) in
  guard let callback = callback else { return } // nobody around to hear the leaf falls
 
  var result: RequestResult<T>

OmiseSDK/Resources/Assets.xcassets/Method/ocbc_digital.imageset/Contents.json → OmiseSDK/Resources/Assets.xcassets/Method/ocbc-digital.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
  "images" : [
  {
- "filename" : "ocbc_digital.png",
+ "filename" : "ocbc-digital.png",
  "idiom" : "universal",
  "scale" : "1x"
  },
  {
- "filename" : "ocbc_digital@2x.png",
+ "filename" : "ocbc-digital@2x.png",
  "idiom" : "universal",
  "scale" : "2x"
  },
  {
- "filename" : "ocbc_digital@3x.png",
+ "filename" : "ocbc-digital@3x.png",
  "idiom" : "universal",
  "scale" : "3x"
  }

OmiseSDKTests/CapabilityOperationFixtureTests.swift

@@ -3,7 +3,6 @@ import XCTest
 
 class CapabilityOperationFixtureTests: XCTestCase {
 
- // swiftlint:disable:next function_body_length
  func testCapabilityRetrieve() {
  let decoder = Client.makeJSONDecoder(for: Request<Source>?.none)
 
@@ -30,30 +29,6 @@ class CapabilityOperationFixtureTests: XCTestCase {
  XCTFail("Capability doesn't have the BAY Installment backend")
  }
 
- if let trueMoneyBackend = capability[OMSSourceTypeValue.trueMoney] {
- XCTAssertEqual(trueMoneyBackend.supportedCurrencies, [.thb])
- } else {
- XCTFail("Capability doesn't have the TrueMoney backend")
- }
-
- if let citiPointsBackend = capability[OMSSourceTypeValue.pointsCiti] {
- XCTAssertEqual(citiPointsBackend.supportedCurrencies, [.thb])
- } else {
- XCTFail("Capability doesn't have the Citi Points backend")
- }
-
- if let rabbitLinePayBackend = capability[OMSSourceTypeValue.rabbitLinepay] {
- XCTAssertEqual(rabbitLinePayBackend.supportedCurrencies, [.thb])
- } else {
- XCTFail("Capability doesn't have the Rabbit LINE Pay backend")
- }
-
- if let ocbcPaoBackend = capability[OMSSourceTypeValue.mobileBankingOCBCPAO] {
- XCTAssertEqual(ocbcPaoBackend.supportedCurrencies, [.sgd])
- } else {
- XCTFail("Capability doesn't have the OCBC Pay Anyone backend")
- }
-
  if let fpxBackend = capability[OMSSourceTypeValue.fpx] {
  XCTAssertEqual(fpxBackend.banks, [
  Capability.Backend.Bank(name: "UOB", code: "uob", isActive: true)
@@ -70,17 +45,20 @@ class CapabilityOperationFixtureTests: XCTestCase {
  XCTFail("Capability doesn't have the Mobile Banking KBank backend")
  }
 
- if let grabPayBackend = capability[OMSSourceTypeValue.grabPay] {
- XCTAssertEqual(grabPayBackend.supportedCurrencies, [.sgd, .myr])
- } else {
- XCTFail("Capability doesn't have the GrabPay backend")
- }
-
- if let payPayBackend = capability[OMSSourceTypeValue.payPay] {
- XCTAssertEqual(payPayBackend.supportedCurrencies, [.jpy])
- } else {
- XCTFail("Capability doesn't have the PayPay backend")
+ func testCapabilitySupportsCurrency(_ capability: Capability, sourceType: OMSSourceTypeValue, currencies: Set<Currency>) {
+ if let backend = capability[sourceType] {
+ XCTAssertEqual(backend.supportedCurrencies, currencies)
+ } else {
+ XCTFail("Capability doesn't have the \(sourceType) backend")
+ }
  }
+
+ testCapabilitySupportsCurrency(capability, sourceType: .trueMoney, currencies: [.thb])
+ testCapabilitySupportsCurrency(capability, sourceType: .pointsCiti, currencies: [.thb])
+ testCapabilitySupportsCurrency(capability, sourceType: .rabbitLinepay, currencies: [.thb])
+ testCapabilitySupportsCurrency(capability, sourceType: .mobileBankingOCBCPAO, currencies: [.sgd])
+ testCapabilitySupportsCurrency(capability, sourceType: .grabPay, currencies: [.sgd, .myr])
+ testCapabilitySupportsCurrency(capability, sourceType: .payPay, currencies: [.jpy])
  } catch {
  XCTFail("Cannot decode the source \(error)")
  }