-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into 9661-add-dod-to-proof-of-vs
- Loading branch information
Showing
19 changed files
with
270 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| name: "App Store requirement checks" | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| - develop | ||
| - 'release/v**' | ||
| paths: | ||
| - "VAMobile/ios/fastlane/metadata/en-US/**" | ||
| - "VAMobile/ios/fastlane/screenshots/**" | ||
|
|
||
| jobs: | ||
| check_ios_ipad_pro2_images: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 10 | ||
| working_dir: VAMobile/ios/fastlane/screenshots/en-US | ||
| file_counting_function: find . -maxdepth 1 -name "ipadPro2*" -printf '.' | wc -m | ||
| check_ios_ipad_pro13_images: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 10 | ||
| working_dir: VAMobile/ios/fastlane/screenshots/en-US | ||
| file_counting_function: find . -maxdepth 1 -name "ipadPro13*" -printf '.' | wc -m | ||
| check_ios_ipad_pro129_images: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 10 | ||
| working_dir: VAMobile/ios/fastlane/screenshots/en-US | ||
| file_counting_function: find . -maxdepth 1 -name "ipadPro12*" -printf '.' | wc -m | ||
| check_ios_iphone55_images: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 10 | ||
| working_dir: VAMobile/ios/fastlane/screenshots/en-US | ||
| file_counting_function: find . -maxdepth 1 -name "phone5*" -printf '.' | wc -m | ||
| check_ios_iphone67_images: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 10 | ||
| working_dir: VAMobile/ios/fastlane/screenshots/en-US | ||
| file_counting_function: find . -maxdepth 1 -name "iphone6*" -printf '.' | wc -m | ||
| check_ios_description: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 4000 | ||
| working_dir: VAMobile/ios/fastlane/metadata/en-US | ||
| file_counting_function: wc -c description.txt | awk '{print $1}' | ||
| check_ios_release_notes: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 4000 | ||
| working_dir: VAMobile/ios/fastlane/metadata/en-US | ||
| file_counting_function: wc -c release_notes.txt | awk '{print $1}' | ||
| check_ios_keyword: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 1000 | ||
| working_dir: VAMobile/ios/fastlane/metadata/en-US | ||
| file_counting_function: wc -c keywords.txt | awk '{print $1}' | ||
| check_ios_title: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 50 | ||
| working_dir: VAMobile/ios/fastlane/metadata/en-US | ||
| file_counting_function: wc -c title.txt | awk '{print $1}' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| name: "App Store requirement checks" | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| - develop | ||
| - 'release/v**' | ||
| paths: | ||
| - "VAMobile/android/fastlane/metadata/android/en-US/**" | ||
|
|
||
| jobs: | ||
| check_max_android_phone_screenshots: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 8 | ||
| working_dir: VAMobile/android/fastlane/metadata/android/en-US/images/phoneScreenshots | ||
| file_counting_function: ls | wc -l | ||
| check_max_android_seven_inch_screenshots: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 8 | ||
| working_dir: VAMobile/android/fastlane/metadata/android/en-US/images/sevenInchScreenshots | ||
| file_counting_function: ls | wc -l | ||
| check_android_long_description: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 4000 | ||
| working_dir: VAMobile/android/fastlane/metadata/android/en-US | ||
| file_counting_function: wc -c full-description.txt | awk '{print $1}' | ||
| check_android_short_description: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 80 | ||
| working_dir: VAMobile/android/fastlane/metadata/android/en-US | ||
| file_counting_function: wc -c short-description.txt | awk '{print $1}' | ||
| check_android_change_log: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 500 | ||
| working_dir: VAMobile/android/fastlane/metadata/android/en-US/changelogs | ||
| file_counting_function: wc -c default.txt | awk '{print $1}' | ||
| check_android_release_name: | ||
| uses: ./.github/workflows/check_max_size.yml | ||
| with: | ||
| max_size: 50 | ||
| working_dir: VAMobile/android/fastlane/metadata/android/en-US | ||
| file_counting_function: wc -c title.txt | awk '{print $1}' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| working_dir: | ||
| required: true | ||
| type: string | ||
| max_size: | ||
| required: true | ||
| type: string | ||
| file_counting_function: | ||
| required: true | ||
| type: string | ||
|
|
||
| jobs: | ||
| check_max_files: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - run: | | ||
| if [[ $(${{ inputs.file_counting_function }}) -gt ${{ inputs.max_size }} ]] | ||
| then | ||
| echo "PR exceeds app store limits of ${{ inputs.max_size }} for this check" | ||
| exit 1 | ||
| fi | ||
| working-directory: ${{ inputs.working_dir }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,6 @@ import { setTimeout } from 'timers/promises' | |
| import { CommonE2eIdConstants, loginToDemoMode, openContactInfo, openProfile, toggleRemoteConfigFlag } from './utils' | ||
|
|
||
| export const ContactInfoE2eIdConstants = { | ||
| CONTACT_INFO_PAGE_ID: 'ContactInfoTestID', | ||
| MAILING_ADDRESS_ID: 'Mailing address 3101 N Fort Valley Rd Flagstaff, AZ, 86001', | ||
| MAILING_ADDRESS_2_ID: 'Mailing address 3101 N Fort Valley Rd, 2 Flagstaff, AZ, 86001', | ||
| HOME_ADDRESS_ID: 'Home address Add your home address', | ||
|
|
@@ -27,7 +26,6 @@ export const ContactInfoE2eIdConstants = { | |
| CANCEL_KEEP_EDITING_TEXT: device.getPlatform() === 'ios' ? 'Keep Editing' : 'Keep Editing ', | ||
| REMOVE_KEEP_TEXT: 'Keep', | ||
| REMOVE_REMOVE_TEXT: 'Remove', | ||
| SAVE_TEXT: 'Save', | ||
| DISMISS_TEXT: 'Dismiss', | ||
| EDIT_ADDRESS_ID: 'EditAddressTestID', | ||
| COUNTRY_PICKER_CONFIRM_ID: 'countryPickerConfirmID', | ||
|
|
@@ -82,10 +80,10 @@ export async function fillHomeAddressFields() { | |
|
|
||
| export async function validateAddresses(addressID: string, addressType: string) { | ||
| it('update the ' + addressType + ' address', async () => { | ||
| await element(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)).scrollTo('top') | ||
| await element(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)).scrollTo('top') | ||
| await waitFor(element(by.id(addressID))) | ||
| .toBeVisible() | ||
| .whileElement(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)) | ||
| .whileElement(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)) | ||
| .scroll(50, 'down') | ||
| await element(by.id(addressID)).tap() | ||
| }) | ||
|
|
@@ -124,10 +122,10 @@ export async function validateAddresses(addressID: string, addressType: string) | |
| }) | ||
|
|
||
| it('should open and update the ' + addressType + ' address', async () => { | ||
| await element(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)).scrollTo('top') | ||
| await element(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)).scrollTo('top') | ||
| await waitFor(element(by.id(addressID))) | ||
| .toBeVisible() | ||
| .whileElement(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)) | ||
| .whileElement(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)) | ||
| .scroll(100, 'down') | ||
| await element(by.id(addressID)).tap() | ||
| await element(by.id(CommonE2eIdConstants.CONTACT_INFO_STREET_ADDRESS_LINE_2_ID)).typeText('2') | ||
|
|
@@ -183,7 +181,7 @@ export async function validatePhoneNumbers(phoneID: string, phoneType: string) { | |
| it('should open the ' + phoneType + ' phone number', async () => { | ||
| await waitFor(element(by.id(phoneID))) | ||
| .toBeVisible() | ||
| .whileElement(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)) | ||
| .whileElement(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)) | ||
| .scroll(100, 'down') | ||
| await element(by.id(phoneID)).tap() | ||
| }) | ||
|
|
@@ -243,7 +241,7 @@ export async function validatePhoneNumbers(phoneID: string, phoneType: string) { | |
| it('should update the ' + phoneType + ' with an extension', async () => { | ||
| await waitFor(element(by.id(phoneID))) | ||
| .toBeVisible() | ||
| .whileElement(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)) | ||
| .whileElement(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)) | ||
| .scroll(100, 'down') | ||
| await element(by.id(phoneID)).tap() | ||
| if (phoneType === 'Work') { | ||
|
|
@@ -279,7 +277,7 @@ export async function validatePhoneNumbers(phoneID: string, phoneType: string) { | |
| it(phoneType + ': verify user can remove the extension', async () => { | ||
| await waitFor(element(by.id(phoneID))) | ||
| .toBeVisible() | ||
| .whileElement(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)) | ||
| .whileElement(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)) | ||
| .scroll(100, 'down') | ||
| await element(by.id(phoneID)).tap() | ||
| await element(by.id(ContactInfoE2eIdConstants.PHONE_NUMBER_EXTENSION_ID)).clearText() | ||
|
|
@@ -301,10 +299,10 @@ export async function validatePhoneNumbers(phoneID: string, phoneType: string) { | |
|
|
||
| export async function removeContactInfoFeature(contactInfoTypeText: string, type: string) { | ||
| it('should tap remove ' + type + ' and verify remove pop up appears', async () => { | ||
| await element(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)).scrollTo('top') | ||
| await element(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)).scrollTo('top') | ||
| await waitFor(element(by.id(contactInfoTypeText))) | ||
| .toBeVisible() | ||
| .whileElement(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)) | ||
| .whileElement(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)) | ||
| .scroll(100, 'down') | ||
| await element(by.id(contactInfoTypeText)).tap() | ||
| await element(by.text('Remove ' + type)).tap() | ||
|
|
@@ -443,7 +441,7 @@ describe(':ios: Contact Info Screen', () => { | |
| removeContactInfoFeature(ContactInfoE2eIdConstants.MOBILE_PHONE_ID, 'mobile phone') | ||
|
|
||
| it('should open the email address', async () => { | ||
| await element(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)).scrollTo('bottom') | ||
| await element(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)).scrollTo('bottom') | ||
| await element(by.id(ContactInfoE2eIdConstants.EMAIL_ADDRESS_ID)).tap() | ||
| }) | ||
|
|
||
|
|
@@ -469,7 +467,7 @@ describe(':ios: Contact Info Screen', () => { | |
| }) | ||
|
|
||
| it('should update the email address and remove the +', async () => { | ||
| await element(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)).scrollTo('bottom') | ||
| await element(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)).scrollTo('bottom') | ||
| await element(by.id(ContactInfoE2eIdConstants.EMAIL_ADDRESS_ID)).tap() | ||
| await element(by.id(ContactInfoE2eIdConstants.EMAIL_ADDRESS_EDIT_ID)).clearText() | ||
| await element(by.id(ContactInfoE2eIdConstants.EMAIL_ADDRESS_EDIT_ID)).typeText('[email protected]') | ||
|
|
@@ -483,7 +481,7 @@ describe(':ios: Contact Info Screen', () => { | |
| await expect(element(by.text('Email address saved'))).toExist() | ||
| await element(by.text(ContactInfoE2eIdConstants.DISMISS_TEXT)).tap() | ||
| } catch (ex) {} | ||
| await element(by.id(ContactInfoE2eIdConstants.CONTACT_INFO_PAGE_ID)).scrollTo('top') | ||
| await element(by.id(CommonE2eIdConstants.CONTACT_INFO_SCREEN_ID)).scrollTo('top') | ||
| }) | ||
|
|
||
| removeContactInfoFeature(ContactInfoE2eIdConstants.EMAIL_ADDRESS_ID, 'email address') | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.