Skip to content

MFTF 2.3.13 - Merge Develop to Master #306

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.

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
merged 122 commits into from
Jan 29, 2019
Merged

MFTF 2.3.13 - Merge Develop to Master #306

merged 122 commits into from
Jan 29, 2019

Conversation

KevinBKozan
Copy link
Contributor

@KevinBKozan KevinBKozan commented Jan 28, 2019

Description

  • Merging MFTF 2.3.13 release items to Master

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/verification tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)
  • Changes to Framework doesn't have backward incompatible changes for tests or have related Pull Request with fixes to tests

vasylmalanka and others added 30 commits March 24, 2018 17:25
…ted actions

- Added WAIT_TIMEOUT environment variable to .env file
- Implemented getDefaultWaitTimeout method that retrieves WAIT_TIMEOUT environment variable or a constant value
- Edited wait action methods to use default timeout if not set
…ted actions

- Added Unit test for getDefaultWaitTimeout method
…ted actions

- Added WAIT_TIMEOUT environment variable to .env file
…ted actions

- Removed .env and updated .env.example file
…ted actions

    - Transformed 'getDefaultWaitTimeout' into static method
…ted actions

    - Used .env.example configuration file instead of .env
    - Changed hardcoded value to environment variable
…ted actions

- Added PHPDoc block to getDefaultWaitTimeout method
- Changed usage of getDefaultWaitTimeout static method in other methods
…ted actions

- Reverted MagentoWebDriver class
- Moved getDefaultWaitTimeout method to ActionObject class
- Changed generateStepsPhp method in TestGenerator class to use timeout from getDefaultWaitTimeout method if not set
- Moved and fixed unit test for the implementation
#54: Set a global value for timeouts that's used across all wait related actions
(cherry picked from commit 14d65c2)
(cherry picked from commit 231fe18)
…TestingFramework\Util\Protocol\CurlTransport)
jilu1 and others added 24 commits December 12, 2018 14:56
- Adding a new action for waitForReactPageLoad to the schema.
- Adding basic structure for the new action to the MagentoWebDriver.
# Conflicts:
#	src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
- Switched gears with this attempt, created a waitForElementVisible action instead of a waitForReactPageLoad action.
- Adding new action, DI updates and Actions updates.
- Renaming the new Actions to make it clear what they are for. Replaced "Js" with "Pwa".
- Updating the action name in the Generator file.
- Created a separate Class for the custom PWA actions.
- Removed the custom PWA actions from MagentoWebDriver.
…update composer.json

- Added Conditional for checking Codeception Version
Allow = to be part of the secret value
MQE-1145: Update FrontendExecutor::authorize() method.
- Added 2.3.13 changelog and bumped version in composer/lock file
@magento-cicd2
Copy link

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
5 out of 6 committers have signed the CLA.

✅ Cristian101
✅ okolesnyk
✅ jilu1
✅ gy741
✅ lbajsarowicz
❌ vasylmalanka

@KevinBKozan
Copy link
Contributor Author

@vasylmalanka could you sign the CLA so that we can include your contributions in the upcoming MFTF release?

@KevinBKozan KevinBKozan changed the title MFTF 2.3.12 - Merge Develop to Master MFTF 2.3.13 - Merge Develop to Master Jan 28, 2019
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.3%) to 57.054% when pulling 9b7d464 on develop into 599004b on master.

- \Magento\FunctionalTestingFramework\Module\MagentoSequence
- \Magento\FunctionalTestingFramework\Module\MagentoAssert
- Asserts
config:
\Magento\FunctionalTestingFramework\Module\MagentoWebDriver:
url: "%MAGENTO_BASE_URL%"
backend_url: "%MAGENTO_BACKEND_BASE_URL%"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this changes should be reflected in Jenkins infra repo
https://github.com/magento-cicd/jenkins-infra/blob/master/mftf/mdc/functional.suite.yml.chrome

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good call. Builds are running fine without it, but I'll create a PR to update the above.

@KevinBKozan KevinBKozan merged commit 2c8a4c3 into master Jan 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.