Skip to content
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

Jump to bottom

Feature/bundle fixture #65

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Feature/bundle fixture #65

wants to merge 6 commits into from

Commits on Jul 15, 2014

  1. Add bundle product fixture

    Carlo Tasca committed Jul 15, 2014
    Configuration menu
    Copy the full SHA
    c8fd02b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/bundle-fixture 

    Conflicts:
	src/MageTest/MagentoExtension/Context/MagentoContext.php
	src/MageTest/MagentoExtension/Fixture/FixtureFactory.php
    Carlo Tasca committed Jul 15, 2014
    Configuration menu
    Copy the full SHA
    796ad8a View commit details
    Browse the repository at this point in the history

  3. Sync Product Fixture with develop branch

    Carlo Tasca committed Jul 15, 2014
    Configuration menu
    Copy the full SHA
    d92cd36 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2014

  1. Add bundle product fixture

    Carlo Tasca committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    fbf5fa1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/bundle-fixture' of github.com:ctasca/BehatMage … 

    …into feature/bundle-fixture

Conflicts:
	src/MageTest/MagentoExtension/Context/MagentoContext.php
	src/MageTest/MagentoExtension/Fixture/BundleProduct.php
    Carlo Tasca committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    43fdbcf View commit details
    Browse the repository at this point in the history

  3. Edit background comment example

    Carlo Tasca committed Jul 30, 2014
    Configuration menu
    Copy the full SHA
    6a547f1 View commit details
    Browse the repository at this point in the history