Skip to content

Merge changes from CD-develop to develop #211

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 15 commits into from
Dec 10, 2018
Merged

Merge changes from CD-develop to develop #211

merged 15 commits into from
Dec 10, 2018

Conversation

okolesnyk
Copy link
Member

Description

Fixed Issues (if relevant)

  1. magento/magento2-functional-testing-framework#<issue_number>: Issue title
  2. ...

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 10 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
@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.
1 out of 2 committers have signed the CLA.

✅ okolesnyk
❌ vasylmalanka

@magento magento deleted a comment from coveralls Dec 10, 2018
@magento magento deleted a comment from coveralls Dec 10, 2018
@okolesnyk okolesnyk merged commit 85b44c3 into develop Dec 10, 2018
@okolesnyk okolesnyk deleted the CD-develop branch December 10, 2018 20:02
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.

3 participants