Refactor tests

Author: NLSanyu

README.md

@@ -70,22 +70,12 @@ collection = Momoapi::Collection.new
 ```
 
 ### Methods
-1. `request_to_pay`: This operation is used to request a payment from a consumer (Payer). The payer will be asked to authorize the payment. The transaction is executed once the payer has authorized the payment. The transaction will be in status PENDING until it is authorized or declined by the payer or it is timed out by the system. Status of the transaction can be validated by using `get_transaction_status`.
+1. `request_to_pay`: This operation is used to request a payment from a consumer (Payer). The payer will be asked to authorize the payment. The transaction is executed once the payer has authorized the payment. The transaction will be in status PENDING until it is authorized or declined by the payer or it is timed out by the system. The status of the transaction can be validated by using `get_transaction_status`. 
 
-2. `get_transaction_status`: Retrieve transaction information using the `transaction_id` returned by `request_to_pay`. You can invoke it at intervals until the transaction fails or succeeds. If the transaction has failed, it will throw an appropriate error. 
+2. `get_transaction_status`: Retrieve transaction information using the `transaction_reference` returned by `request_to_pay`. You can invoke it at intervals until the transaction fails or succeeds. If the transaction has failed, it will throw an appropriate error. 
 
 3. `get_balance`: Get the balance of the account.
 
-### Sample Code
-
-```ruby
-require 'momoapi-ruby'
-
-collection = Momoapi::Collection.new
-collection.request_to_pay(
-    phone_number="256772123456", amount=600, external_id="123456789", payee_note="dd", payer_message="dd", currency="EUR")
-```
-An extra argument, `callback_url`, can be passed to this method, denoting the URL to the server where the callback should be sent.
 
 ## Disbursements
 The disbursements client can be created with the following paramaters. The `DISBURSEMENT_USER_ID` and `DISBURSEMENT_API_SECRET` for production are provided on the MTN OVA dashboard.
@@ -110,22 +100,12 @@ disbursement = Momoapi::Disbursement.new
 ```
 
 ### Methods
-1. `transfer`: Used to transfer an amount from the owner’s account to a payee account. Status of the transaction can be validated by using the `get_transaction_status` method.
+1. `transfer`: Used to transfer an amount from the owner’s account to a payee account. The status of the transaction can be validated by using the `get_transaction_status` method.
 
-2. `get_transaction_status`: Retrieve transaction information using the `transaction_id` returned by `transfer`. You can invoke it at intervals until the transaction fails or succeeds. If the transaction has failed, it will throw an appropriate error. 
+2. `get_transaction_status`: Retrieve transaction information using the `transaction_reference` returned by `transfer`. You can invoke it at intervals until the transaction fails or succeeds. If the transaction has failed, it will throw an appropriate error. 
 
 3. `get_balance`: Get the balance of the account.
 
-### Sample Code
-
-```ruby
-require 'momoapi-ruby'
-
-disbursement = Momoapi::Disbursement.new
-disbursement.transfer(
-    phone_number="256772123456", amount=600, external_id="123456789", payee_note="dd", payer_message="dd", currency="EUR")
-```
-An extra argument, `callback_url`, can be passed to this method, denoting the URL to the server where the callback should be sent.
 
 ## Remittances
 The remittances client can be created with the following paramaters. The `REMITTANCES_USER_ID` and `REMITTANCES_API_SECRET` for production are provided on the MTN OVA dashboard.
@@ -150,22 +130,39 @@ remittance = Momoapi::Remittance.new
 ```
 
 ### Methods
-1. `transfer`: Used to transfer an amount from the owner’s account to a payee account. Status of the transaction can be validated by using the `get_transaction_status` method.
+1. `transfer`: Used to transfer an amount from the owner’s account to a payee account. The status of the transaction can be validated by using the `get_transaction_status` method. 
 
-2. `get_transaction_status`: Retrieve transaction information using the `transaction_id` returned by `transfer`. You can invoke it at intervals until the transaction fails or succeeds. If the transaction has failed, it will throw an appropriate error. 
+2. `get_transaction_status`: Retrieve transaction information using the `transaction_reference` returned by `transfer`. You can invoke it at intervals until the transaction fails or succeeds. If the transaction has failed, it will throw an appropriate error. 
 
 3. `get_balance`: Get the balance of the account.
 
-### Sample Code
+
+## Sample Code
 
 ```ruby
 require 'momoapi-ruby'
 
-remittance = Momoapi::Remittance.new
-remittance.transfer(
+collection = Momoapi::Collection.new 
+
+collection.is_user_active('256772123456')
+
+collection.get_balance
+
+transaction = collection.request_to_pay(
     phone_number="256772123456", amount=600, external_id="123456789", payee_note="dd", payer_message="dd", currency="EUR")
+
+transaction_ref = transaction[:transaction_reference]
+
+collection.get_transaction_status(transaction_ref)
+
 ```
-An extra argument, `callback_url`, can be passed to this method, denoting the URL to the server where the callback should be sent.
+
+### Points to note:
+All methods for Disbursements and Remittances follow the same format as the examples shown above for Collections 
+
+The 'transfer' method for Disbursements and Remittances follows the same format as 'request_to_pay' above.
+
+An extra argument, `callback_url`, can be passed to the 'request_to_pay' and 'transfer' methods, denoting the URL to the server where the callback should be sent.
 
 
 ## Contributing

lib/momoapi-ruby/cli.rb

@@ -21,9 +21,10 @@ def initialize(option)
       create_sandbox_user
     end
 
+    # Create an API user in the sandbox target environment
     def create_sandbox_user
       body = { "providerCallbackHost": @host }
-      @url = 'https://sandbox.momodeveloper.mtn.com/v1_0/apiuser'
+      @url = 'https://ericssonbasicapi2.azure-api.net/v1_0/apiuser'
       response = Faraday.post(@url) do |req|
         req.headers['Content-Type'] = 'application/json'
         req.headers['X-Reference-Id'] = @uuid
@@ -38,8 +39,9 @@ def create_sandbox_user
       generate_api_key
     end
 
+    # Generate an API key in the sandbox target environment
     def generate_api_key
-      @url = 'https://sandbox.momodeveloper.mtn.com/v1_0/apiuser/' +
+      @url = 'https://ericssonbasicapi2.azure-api.net/v1_0/apiuser/' +
              @uuid + '/apikey'
       response = Faraday.post(@url) do |req|
         req.headers['Ocp-Apim-Subscription-Key'] = @key

spec/cassettes/Momoapi_Collection/collections/gets_transaction_status.yml

@@ -15,10 +15,8 @@
 
   describe 'collections', vcr: { record: :new_episodes } do
     it 'checks if user is active' do
-      # response = Momoapi::Collection.new.is_user_active('0243656543')
-      # expect(response[:code]).to eq(200)
-      expect { Momoapi::Collection.new.is_user_active('0243656543') }
-        .to raise_error(Momoapi::Error)
+      response = Momoapi::Collection.new.is_user_active('0243656543')
+      expect(response).to be_a_kind_of(Hash)
     end
 
     it 'gets balance' do
@@ -27,9 +25,7 @@
     end
 
     it 'gets transaction status' do
-      ref = '888a79ff-0535-4a9f-8a66-457f7903bd8a'
-      # response = Momoapi::Collection.new.get_transaction_status(ref)
-      # expect(response[:code]).to eq(200)
+      ref = '3700b523-c5d9-446e-8c01-a6261903a9ba'
       expect { Momoapi::Collection.new.get_transaction_status(ref) }
         .to raise_error(Momoapi::Error)
     end

spec/cassettes/Momoapi_Disbursement/disbursements/checks_if_user_is_active.yml

@@ -14,6 +14,11 @@
   end
 
   describe 'disbursements', vcr: { record: :new_episodes } do
+    it 'checks if user is active' do
+      response = Momoapi::Disbursement.new.is_user_active('0243656543')
+      expect(response).to be_a_kind_of(Hash)
+    end
+
     it 'gets balance' do
       expect { Momoapi::Disbursement.new.get_balance }
         .to raise_error(Momoapi::Error)

spec/cassettes/Momoapi_Remittance/remittances/checks_if_user_is_active.yml

@@ -14,6 +14,11 @@
   end
 
   describe 'remittances', vcr: { record: :new_episodes } do
+    it 'checks if user is active' do
+      response = Momoapi::Remittance.new.is_user_active('0243656543')
+      expect(response).to be_a_kind_of(Hash)
+    end
+
     it 'gets balance' do
       expect { Momoapi::Remittance.new.get_balance }
         .to raise_error(Momoapi::Error)