Skip to content

further fixes #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 2 commits into from
Jul 16, 2026
Merged

further fixes #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abbd0f8
further fixes
StuartFerguson Jul 16, 2026
52313b2
Merge branch 'main' into nightly/#770_fix_failures
StuartFerguson Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FileProcessor.IntegrationTests/Features/FileProfile.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ Scenario: Reject duplicate file profile name and request type
| DuplicateType | BasedOn |
| Name | Profile A |
| RequestType | Profile B |
#And the file profiles list should contain 2 items
And the file profiles list should contain 2 items
3 changes: 3 additions & 0 deletions FileProcessor.IntegrationTests/Features/FileProfile.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions FileProcessor.IntegrationTests/Features/FileProfileSteps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public async Task WhenITryToCreateTheFollowingDuplicateFileProfiles(DataTable ta
}

[Then(@"the file profiles list should contain (.*) items")]
[When(@"the file profiles list should contain (.*) items")]
public async Task ThenTheFileProfilesListShouldContainItems(int expectedCount)
{
Result<List<FileProfile>> fileProfilesResult = await this.FileProcessorSteps.GetFileProfiles(this.TestingContext.AccessToken, CancellationToken.None);
Expand Down
1 change: 0 additions & 1 deletion FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ Background:
| Deposit1 | 300.00 | Today | Test Merchant 2 | Test Estate 1 |

@PRTest
@Nightly1
Scenario: Get File Import Log Details
Given I have a file named 'SafarcomTopup1.txt' with the following contents
| Column1 | Column2 | Column3 |
Expand Down
278 changes: 138 additions & 140 deletions FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature.cs
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Background:
| Reference | Amount | DateTime | MerchantName | EstateName |
| Deposit1 | 300.00 | Today | Test Merchant 1 | Test Estate 1 |

@Nightly

Scenario: Process Safaricom Topup File with 1 detail row
Given I have a file named 'SafarcomTopup.txt' with the following contents
| Column1 | Column2 | Column3 |
Expand All @@ -88,7 +88,6 @@ Scenario: Process Safaricom Topup File with 1 detail row

#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 1 transaction should be returned

@Nightly
Scenario: Process Safaricom Topup File with 2 detail rows
Given I have a file named 'SafarcomTopup.txt' with the following contents
| Column1 | Column2 | Column3 |
Expand All @@ -102,7 +101,6 @@ Scenario: Process Safaricom Topup File with 2 detail rows

#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 2 transaction should be returned

@Nightly
Scenario: Process 2 Safaricom Topup Files
Given I have a file named 'SafarcomTopup1.txt' with the following contents
| Column1 | Column2 | Column3 |
Expand All @@ -126,7 +124,6 @@ Scenario: Process 2 Safaricom Topup Files
#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 3 transaction should be returned

@PRTest
@Nightly
Scenario: Process Duplicate Safaricom Topup File with 1 detail row
Given I have a file named 'SafarcomTopup1.txt' with the following contents
| Column1 | Column2 | Column3 |
Expand All @@ -151,7 +148,6 @@ Scenario: Process Duplicate Safaricom Topup File with 1 detail row
| Test Estate 1 | Test Merchant 1 | B2A59ABF-293D-4A6B-B81B-7007503C3476 | ABA59ABF-293D-4A6B-B81B-7007503C3476 |

# Wrong Format??
@Nightly
Scenario: Process Safaricom Topup File with Upload Date Time
Given I have a file named 'SafarcomTopup.txt' with the following contents
| Column1 | Column2 | Column3 |
Expand Down
310 changes: 150 additions & 160 deletions FileProcessor.IntegrationTests/Features/ProcessTopupCSV.feature.cs
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions FileProcessor.IntegrationTests/Features/ProcessVoucherCSV.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ Background:
| Reference | Amount | DateTime | MerchantName | EstateName |
| Deposit1 | 300.00 | Today | Test Merchant 1 | Test Estate 1 |

@Nightly2
Scenario: Process Voucher File with 1 detail row for recipient email
Given I have a file named 'VoucherIssue.txt' with the following contents
| Column1 | Column2 | Column3 | Column4 |
Expand All @@ -89,7 +88,6 @@ Scenario: Process Voucher File with 1 detail row for recipient email

#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 1 transaction should be returned

@Nightly2
Scenario: Process Voucher File with 1 detail row for recipient mobile
Given I have a file named 'VoucherIssue.txt' with the following contents
| Column1 | Column2 | Column3 | Column4 |
Expand All @@ -102,7 +100,6 @@ Scenario: Process Voucher File with 1 detail row for recipient mobile

#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 1 transaction should be returned

@Nightly2
Scenario: Process Voucher File with 2 detail rows
Given I have a file named 'VoucherIssue.txt' with the following contents
| Column1 | Column2 | Column3 | Column4 |
Expand All @@ -116,7 +113,6 @@ Scenario: Process Voucher File with 2 detail rows

#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 2 transaction should be returned

@Nightly2
Scenario: Process 2 Voucher Files
Given I have a file named 'VoucherIssue1.txt' with the following contents
| Column1 | Column2 | Column3 | Column4 |
Expand All @@ -141,7 +137,6 @@ Scenario: Process 2 Voucher Files
#When As merchant "Test Merchant 1" on Estate "Test Estate 1" I get my transactions 4 transaction should be returned

@PRTest
@Nightly2
Scenario: Process Duplicate Voucher Topup File with 1 detail row
Given I have a file named 'VoucherIssue1.txt' with the following contents
| Column1 | Column2 | Column3 | Column4 |
Expand Down
Loading
Loading