Skip to content

Commit

Permalink
Merge pull request #207 from nodlesh/fix/bcw-onboarding-skip-removal
Browse files Browse the repository at this point in the history
BCW remove Skip from onboarding tests
  • Loading branch information
nodlesh authored Nov 15, 2023
2 parents 429c8c3 + 2ef5c63 commit c1334db
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 63 deletions.
10 changes: 5 additions & 5 deletions aries-mobile-tests/features/bc_wallet/credential_offer.feature
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Feature: Offer a Credential

@T002-CredentialOffer @critical @AcceptanceTest @Story_79 @Story_82
Scenario: Holder accepts the credential offer recieved
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -43,7 +43,7 @@ Feature: Offer a Credential

@T002.1-CredentialOffer @critical @AcceptanceTest @Story_79 @Story_82
Scenario Outline: Holder accepts the credential offer recieved
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -65,7 +65,7 @@ Feature: Offer a Credential

@T003-CredentialOffer @wip @critical @AcceptanceTest @Story_79
Scenario: Holder declines the credential offer recieved
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand Down Expand Up @@ -110,7 +110,7 @@ Feature: Offer a Credential

@T006-CredentialOffer @wip @critical @AcceptanceTest @Story_79 @Story_82
Scenario: Holder accepts the credential offer recieved with previous credential(s)
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand Down Expand Up @@ -145,7 +145,7 @@ Feature: Offer a Credential

@T008-CredentialOffer @normal @FunctionalTest @PerformanceTest
Scenario Outline: Holder multiple credentials and no issuance should talke a long time
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand Down
26 changes: 13 additions & 13 deletions aries-mobile-tests/features/bc_wallet/onboarding.feature
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ Feature: Onboarding
And are brought to the Terms and Conditions screen


@T002-Onboarding @AcceptanceTest
Scenario Outline: New User skips onboarding screens
Given the new user has opened the app for the first time
And the user is on the Is this app for you screen
And the user selects confirms that the app is for them
And they select Continue
And the user is on the onboarding <screen>
When the user selects Skip
Then are brought to the Terms and Conditions screen
# @T002-Onboarding @AcceptanceTest @depricated_nov_7_2023
# Scenario Outline: New User skips onboarding screens
# Given the new user has opened the app for the first time
# And the user is on the Is this app for you screen
# And the user selects confirms that the app is for them
# And they select Continue
# And the user is on the onboarding <screen>
# When the user selects Skip
# Then are brought to the Terms and Conditions screen

Examples:
| screen |
| A different smart wallet screen |
| Digital credentials screen |
# Examples:
# | screen |
# | A different smart wallet screen |
# | Digital credentials screen |


@T003-Onboarding @AcceptanceTest
Expand Down
20 changes: 10 additions & 10 deletions aries-mobile-tests/features/bc_wallet/proof.feature
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Feature: Proof

@T002-Proof @critical @AcceptanceTest @Story_29 @SmokeTest
Scenario: Holder accepts the proof request
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -52,7 +52,7 @@ Feature: Proof

@T002.1-Proof @critical @AcceptanceTest @Story_29
Scenario Outline: Holder accepts the proof request
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -76,7 +76,7 @@ Feature: Proof

@T002.2-Proof @normal @FunctionalTest @Story_29
Scenario Outline: Holder accepts the proof request credential has special characters
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -97,7 +97,7 @@ Feature: Proof

@T003-Proof @critical @AcceptanceTest @Revocation
Scenario Outline: Holder accepts the proof request of a revoked credential where the verifier cares if the credential was revoked
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -119,7 +119,7 @@ Feature: Proof

@T004-Proof @normal @AcceptanceTest @Revocation
Scenario Outline: Holder accepts the proof request of a non-revoked revokable credential where the verifier cares if the credential was revoked
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -143,7 +143,7 @@ Feature: Proof

@T005-Proof @normal @AcceptanceTest @Revocation
Scenario Outline: Holder accepts the proof request of a revoked credential where the verifier doesn't care if the credential was revoked
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -168,7 +168,7 @@ Feature: Proof

@T006-Proof @normal @AcceptanceTest @Revocation
Scenario Outline: Holder accepts the proof request of a non-revoked revokable credential where the verifier doesn't care if the credential was revoked
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -193,7 +193,7 @@ Feature: Proof
# if a non-revokable credential can be presented then that should take precedent over revokable credentials since it de facto satisfies proof of non-revocation.
@T007-Proof @normal @AcceptanceTest @Revocation
Scenario Outline: Holder accepts the proof request of a non-revoked credential and presents a non-revokable credential
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -219,7 +219,7 @@ Feature: Proof

@T008-Proof @critical @AcceptanceTest @Revocation
Scenario Outline: Holder accepts the proof request of a non-revoked credential and presents a non-revokable credential that has been revoked and reissued
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand Down Expand Up @@ -386,7 +386,7 @@ Feature: Proof

@T012.1-Proof @normal @AcceptanceTest @SelfAttestation @Story_239 @wip
Scenario Outline: Holder accepts the proof request that contains self-attested attributes but the attribute is in an existing credential
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand Down
4 changes: 2 additions & 2 deletions aries-mobile-tests/features/bc_wallet/security.feature
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Feature: Secure your Wallet

@T005-Security @AcceptanceTest @ExceptionTest @normal
Scenario: New User Sets Up PIN but PINs do not match
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And the User is on the PIN creation screen
When the User enters the first PIN as "369369"
Expand All @@ -78,7 +78,7 @@ Feature: Secure your Wallet

@T006-Security @FunctionalTest @ExceptionTest @normal
Scenario Outline: New User Sets Up PIN but does not follow conventions
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And the User is on the PIN creation screen
When the User enters the first PIN as <pin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ def step_impl(context, using_the_app):
''')
elif using_the_app == "PIN Setup":
context.execute_steps(f'''
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And the User is on the PIN creation screen
''')
elif using_the_app == "Receiving Credential":
context.execute_steps(f'''
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -157,7 +157,7 @@ def step_impl(context, using_the_app):
''')
elif using_the_app == "Presenting Proof":
context.execute_steps(f'''
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand Down
6 changes: 3 additions & 3 deletions aries-mobile-tests/features/steps/bc_wallet/onboarding.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ def step_impl(context, screen):
raise Exception(f"Unexpected screen, {screen}")


@when('the user selects Skip')
def step_impl(context):
context.thisTermsAndConditionsPage = context.currentOnboardingPage.select_skip()
# @when('the user selects Skip')
# def step_impl(context):
# context.thisTermsAndConditionsPage = context.currentOnboardingPage.select_skip()


@when('the user selects Back')
Expand Down
4 changes: 2 additions & 2 deletions aries-mobile-tests/features/steps/bc_wallet/proof.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def step_impl(context):
@given('the PCTF Member has setup thier Wallet')
def step_impl(context):
context.execute_steps(f'''
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
And the Holder has selected to use biometrics to unlock BC Wallet
Expand All @@ -385,7 +385,7 @@ def step_impl(context):
@given('the Holder has setup thier Wallet')
def step_impl(context):
context.execute_steps(f'''
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "369369"
''')
Expand Down
20 changes: 10 additions & 10 deletions aries-mobile-tests/features/steps/bc_wallet/terms.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ def step_impl(context):
''')


@given('the User has skipped on-boarding')
def step_impl(context):
context.execute_steps(f'''
Given the new user has opened the app for the first time
Given the user is on the Is this app for you screen
When the user selects confirms that the app is for them
And they select Continue
And they are brought to the A different smart wallet screen
And the user selects Skip
''')
# @given('the User has skipped on-boarding')
# def step_impl(context):
# context.execute_steps(f'''
# Given the new user has opened the app for the first time
# Given the user is on the Is this app for you screen
# When the user selects confirms that the app is for them
# And they select Continue
# And they are brought to the A different smart wallet screen
# And the user selects Skip
# ''')

@given('the User was on the Terms and Conditions screen')
@given('the User is on the Terms and Conditions screen')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def an_existing_wallet_user(context):
biometrics = context.table[0]['biometrics']

context.execute_steps(f'''
Given the User has skipped on-boarding
Given the User has completed on-boarding
And the User has accepted the Terms and Conditions
And a PIN has been set up with "{pin}"
''')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class OnboardingADifferentSmartWalletPage(BasePage):
# Locators
on_this_page_text_locator = "A different smart wallet"
on_this_page_locator = (AppiumBy.NAME, "A different smart wallet")
skip_locator = (AppiumBy.ID, "com.ariesbifold:id/Skip")
#skip_locator = (AppiumBy.ID, "com.ariesbifold:id/Skip")
next_locator = (AppiumBy.ID, "com.ariesbifold:id/Next")

def on_this_page(self):
Expand All @@ -31,9 +31,9 @@ def select_next(self):
else:
raise Exception(f"App not on the {type(self)} page")

def select_skip(self):
if self.on_this_page():
self.find_by(self.skip_locator).click()
return TermsAndConditionsPage(self.driver)
else:
raise Exception(f"App not on the {type(self)} page")
# def select_skip(self):
# if self.on_this_page():
# self.find_by(self.skip_locator).click()
# return TermsAndConditionsPage(self.driver)
# else:
# raise Exception(f"App not on the {type(self)} page")
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class OnboardingDigitalCredentialsPage(BasePage):
# Locators
on_this_page_text_locator = "Digital credentials"
on_this_page_locator = (AppiumBy.NAME, "Digital credentials")
skip_locator = (AppiumBy.ID, "com.ariesbifold:id/Skip")
#skip_locator = (AppiumBy.ID, "com.ariesbifold:id/Skip")
back_locator = (AppiumBy.ID, "com.ariesbifold:id/Back")
next_locator = (AppiumBy.ID, "com.ariesbifold:id/Next")

Expand Down Expand Up @@ -40,9 +40,9 @@ def select_back(self):
else:
raise Exception(f"App not on the {type(self)} page")

def select_skip(self):
if self.on_this_page():
self.find_by(self.skip_locator).click()
return TermsAndConditionsPage(self.driver)
else:
raise Exception(f"App not on the {type(self)} page")
# def select_skip(self):
# if self.on_this_page():
# self.find_by(self.skip_locator).click()
# return TermsAndConditionsPage(self.driver)
# else:
# raise Exception(f"App not on the {type(self)} page")

0 comments on commit c1334db

Please sign in to comment.