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.

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

Dev #59

Merged
merged 98 commits into from
Nov 5, 2017
Merged

Dev #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
2342505
Initial commit
pamil Jan 12, 2017
7d4a070
Remove unnecessary dependencies
pamil Jan 12, 2017
da38549
Make test code autoloaded not only in development mode
pamil Jan 12, 2017
e0dd600
Add minimalistic usage section
pamil Jan 12, 2017
3e88d44
Switch tests namespace to follow Symfony convention
pamil Jan 12, 2017
20bd019
Add rest of Sylius dependencies (see #4)
pamil Jan 12, 2017
96bd15a
Make application bootable
pamil Jan 12, 2017
88bbf25
Implement "Greet a customer with unknown name" feature
pamil Jan 12, 2017
a9a82fb
Implement "Greet a customer with known name" feature
pamil Jan 12, 2017
6362708
Implement "Greet Lionel Richie" feature
pamil Jan 12, 2017
48e8608
Improve typehints
pamil Jan 12, 2017
a83251b
Merge pull request #5 from pamil/greeting-a-customer
pamil Jan 12, 2017
26bb6e1
Set up database schema on Travis
pamil Jan 12, 2017
60849a8
Implement dynamic customer greeting (including Lionel Richie)
pamil Jan 12, 2017
e5ec120
Handle JS tests on Travis
pamil Jan 13, 2017
5abe928
Merge pull request #6 from pamil/dynamically-greeting-a-customer
pamil Jan 13, 2017
d75c796
Handle assets in test environment
pamil Jan 13, 2017
8c172ce
Merge pull request #8 from pamil/external-js-gulp
pjedrzejewski Jan 17, 2017
68830cb
Rename package to "sylius/bundle-skeleton"
pamil Mar 2, 2017
6627e8b
Ignore behat builds logs
lchrusciel Mar 3, 2017
b3fff7b
[README] Adding testing note and fix usage command
lchrusciel Mar 6, 2017
d4b0722
Merge pull request #10 from lchrusciel/readme
pamil Mar 6, 2017
1d7d99b
Merge pull request #9 from lchrusciel/patch-1
pamil Mar 6, 2017
e1b47d7
[Maintenance] Bring back var folder
lchrusciel Mar 8, 2017
b8e9847
Merge pull request #11 from lchrusciel/var
pamil Mar 9, 2017
9fa56ac
Update composer.json
pjedrzejewski Apr 11, 2017
4c0bec9
Rename to Plugin and fix tests
pjedrzejewski Apr 30, 2017
5ba8031
Use yarn
pjedrzejewski Apr 30, 2017
377986b
Disable yarn for now
pjedrzejewski Apr 30, 2017
ca25ff6
Merge pull request #21 from pjedrzejewski/hotfixes
lchrusciel Apr 30, 2017
a158e08
[HOTFIX] Make master green again
lchrusciel Apr 30, 2017
9ae23d3
Merge pull request #23 from Sylius/lchrusciel-patch-1
pjedrzejewski Apr 30, 2017
1bbcc29
Update configurations
pjedrzejewski Apr 30, 2017
3cdac9b
Merge pull request #24 from pjedrzejewski/update-configurations
lchrusciel Apr 30, 2017
27e6c7f
Adjust target path for assets:install
stefandoorn Aug 1, 2017
8218004
Merge pull request #31 from stefandoorn/adjust-assets-install-path
pamil Aug 2, 2017
4c308fd
Require PHP7.1
Zales0123 Sep 4, 2017
b4bcd85
Merge pull request #34 from Zales0123/php71
pamil Sep 11, 2017
0a04685
Use stable Sylius
pamil Sep 15, 2017
c8a612e
Merge pull request #36 from pamil/use-stable-release
Zales0123 Sep 15, 2017
7586fde
Merge branch '1.0'
pamil Sep 15, 2017
d34dde5
Treat `dev-master` as 1.1
pamil Sep 15, 2017
adbc65d
Merge pull request #38 from pamil/master-1.1
pamil Sep 15, 2017
c644084
Run Javascript scenarios & use Yarn
pamil Sep 15, 2017
627f074
Set up MinkDebugExtension
pamil Sep 15, 2017
0435c7e
Fix templates path
pamil Sep 15, 2017
e5e66d3
Remove PerformanceExtension
pamil Sep 15, 2017
4762c4c
Merge pull request #40 from pamil/remove-performance-extension
pamil Sep 15, 2017
4df70c4
Merge pull request #39 from pamil/travis-js
pamil Sep 15, 2017
226e153
Merge branch '1.0'
pamil Sep 15, 2017
a736704
Move cache and logs directories to a temporary dir
pamil Sep 18, 2017
1737d53
Move database file out of cache directory
pamil Sep 18, 2017
b1c436f
Remove `app/autoload.php`
pamil Sep 18, 2017
ed2c553
Merge pull request #41 from pamil/remove-app-autoload
pamil Sep 18, 2017
249ce57
Add development environment
pamil Sep 18, 2017
3dfd2ad
Merge pull request #42 from pamil/dev-environment
lchrusciel Sep 18, 2017
735b31e
Merge pull request #43 from pamil/var-directories
lchrusciel Sep 18, 2017
7051118
Run a Sylius scenario to see whether JS are loading correctly
pamil Sep 19, 2017
96bc64a
Make readme look like Sylius one
pamil Sep 19, 2017
840d6ae
Rerun failed Behat scenarios
pamil Sep 19, 2017
efe8027
Make Gulp great again
pamil Sep 19, 2017
3d5679c
Merge pull request #45 from Sylius/readme-enhancement
lchrusciel Sep 19, 2017
dc894dc
Merge pull request #44 from pamil/1.0-running-a-sylius-scenario-js
lchrusciel Sep 19, 2017
aa1d0c9
Merge branch '1.0'
pamil Sep 19, 2017
5925b2b
Merge branch '1.0'
pamil Sep 19, 2017
1dddaff
Make badges great again
pamil Sep 19, 2017
9d42647
Update README.md
pamil Sep 19, 2017
5425ad1
Merge pull request #46 from pamil/1.0-remove-alt-from-badges
Zales0123 Sep 19, 2017
297dd0a
Move Composer binaries from `vendor/bin/` to to be consistent with S…
pamil Sep 19, 2017
cbb0f93
Add docs about loading fixtures
pamil Sep 19, 2017
1cb6f07
Merge pull request #47 from pamil/1.0-readme
lchrusciel Sep 19, 2017
fb928b2
Merge branch '1.0'
pamil Sep 19, 2017
3461627
Remove composer.lock
pamil Sep 19, 2017
5c53967
Merge pull request #48 from pamil/1.0-lock
lchrusciel Sep 19, 2017
edb5056
Prepare for 1.0.0 release
pamil Sep 19, 2017
c17a50e
Merge branch '1.0'
pamil Sep 19, 2017
14ea7bc
README: Composer already runs dependencies installation while creatin…
pamil Sep 19, 2017
628b611
Merge branch '1.0'
pamil Sep 19, 2017
26101a1
Make README great again
pamil Sep 27, 2017
c358a25
Merge pull request #51 from pamil/1.0-readme-xd
pjedrzejewski Sep 27, 2017
865165f
Merge branch '1.0'
pamil Sep 27, 2017
5414876
Update README.md
marek-pietrzak-tg Sep 28, 2017
3d2f20f
Merge pull request #52 from mheki/patch-1
lchrusciel Sep 28, 2017
cd1dcc3
Update README.md
marek-pietrzak-tg Sep 28, 2017
b557ce0
Merge branch '1.0'
pamil Sep 28, 2017
f413951
Set up coding standard tool
pamil Sep 28, 2017
14e1647
Apply coding standard fixes
pamil Sep 28, 2017
bb9399a
Merge pull request #53 from pamil/1.0-coding-standard
pamil Sep 28, 2017
aa84748
Merge branch '1.0'
pamil Sep 28, 2017
4deb5f4
FAQ section CR
bitbager Nov 5, 2017
3e4c0ca
Add render block controller
bitbager Nov 5, 2017
670680c
[Behat] Strict type behat classes
bitbager Nov 5, 2017
f7a82a4
[Behat] Cleanup pages services
bitbager Nov 5, 2017
966cfab
[Behat] Cleanup pages services
bitbager Nov 5, 2017
b266985
[Fixtures] Add Pages and FAQ fixtures
bitbager Nov 5, 2017
e3a0bc0
[General] Update PluginSkeleton to 1.0.2
bitbager Nov 5, 2017
b9b6dc4
[Block] Fix upload image paths
bitbager Nov 5, 2017
8a767a9
Remove ignored files
bitbager Nov 5, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
/vendor/
/bin/
!/bin/.gitkeep

/vendor/
/node_modules/
tests/Application/node_modules/
/composer.lock

/etc/build/*
!/etc/build/.gitkeep

tests/Application/var/
!tests/Application/var/.gitkeep

!tests/Application/web/app_test.php
tests/Application/web/media/*
tests/Application/web/bundles
!/etc/build/.gitkeep
31 changes: 27 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,57 @@
language: php

dist: precise

sudo: required

php:
- 7.1

cache:
directories:
- ~/.composer/cache/files
yarn: true

env:
global:
- SYLIUS_BUILD_DIR=etc/build
- TRAVIS_NODE_VERSION="7.5"

before_install:
- phpenv config-rm xdebug.ini || true
- echo "memory_limit=4096M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

# Install Node Version Manager to install newer node version
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout $(git describe --abbrev=0 --tags)) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION

# Install Yarn globally
- sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
- echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
- sudo apt-get update -qq
- sudo apt-get install -y -qq yarn=0.21.3-1

install:
- composer update --prefer-dist
- (cd tests/Application && yarn install)

before_script:
- (cd tests/Application && bin/console doctrine:schema:create --env=test)
- (cd tests/Application && bin/console assets:install web --env=test)
- (cd tests/Application && yarn run gulp)

- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1680x1050x16
- export DISPLAY=:99

- curl http://chromedriver.storage.googleapis.com/2.12/chromedriver_linux64.zip > chromedriver.zip && unzip chromedriver.zip

- cp etc/travis/behat.yml ./behat.yml
- vendor/bin/selenium-server-standalone -Dwebdriver.chrome.driver=chromedriver > /dev/null 2>&1 &
- (cd tests/Application && bin/console server:run 127.0.0.1:8080 --env=test --quiet > /dev/null 2>&1 &)
- bin/selenium-server-standalone -Dwebdriver.chrome.driver=chromedriver > /dev/null 2>&1 &
- (cd tests/Application && bin/console server:run 127.0.0.1:8080 -d web --env=test --quiet > /dev/null 2>&1 &)

script:
- composer validate --strict

- vendor/bin/phpspec run
- vendor/bin/behat --strict -vvv --no-interaction --tags ~@javascript
- bin/behat --strict -vvv --no-interaction || bin/behat --strict -vvv --no-interaction --rerun

after_failure:
- vendor/lakion/mink-debug-extension/travis/tools/upload-textfiles "${SYLIUS_BUILD_DIR}/*.log"
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![BitBag](https://bitbag.pl/static/bitbag-logo.png)
![BitBag](https://lh6.googleusercontent.com/zj9Paf-0CgHtwr_uqtM722d_sVtfNI-YfIpoaU9SZEc8_QFvIJ68fqDAXwtIqhTp6DWwannD=w1440-h729-rw)

# BitBag CmsPlugin [![Build Status](https://travis-ci.org/bitbag-commerce/CmsPlugin.svg?branch=master)](https://travis-ci.org/bitbag-commerce/CmsPlugin)

Expand Down Expand Up @@ -101,4 +101,8 @@ $ vendor/bin/phpspec run

## Contribution

Learn more about our contribution workflow on http://docs.sylius.org/en/latest/contributing/.
Learn more about our contribution workflow on http://docs.sylius.org/en/latest/contributing/.

## Support

Do you want us to customize this plugin for your specific needs? Write us an email on [email protected] :computer:
2 changes: 0 additions & 2 deletions behat.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ default:
FriendsOfBehat\ContextServiceExtension:
imports:
- vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml
- tests/Behat/Resources/pages.yml
- tests/Behat/Resources/contexts.yml
- tests/Behat/Resources/services.yml

FriendsOfBehat\SymfonyExtension:
Expand Down
29 changes: 20 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,39 @@
"license": "MIT",
"require": {
"php": "^7.1",
"sylius/sylius": "^1.0.0"

"sylius/sylius": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^3.2",
"phpunit/phpunit": "^5.6",
"behat/behat": "^3.3",
"behat/mink": "^1.7",
"behat/mink-browserkit-driver": "^1.3",
"behat/mink-extension": "^2.2",
"behat/mink-selenium2-driver": "^1.3",
"friends-of-behat/context-service-extension": "^0.3",
"friends-of-behat/cross-container-extension": "^0.2",
"friends-of-behat/performance-extension": "^1.0",
"friends-of-behat/service-container-extension": "^0.3",
"friends-of-behat/symfony-extension": "^0.2.1",
"friends-of-behat/variadic-extension": "^0.1",
"friends-of-behat/context-service-extension": "^1.0",
"friends-of-behat/cross-container-extension": "^1.0",
"friends-of-behat/service-container-extension": "^1.0",
"friends-of-behat/symfony-extension": "^1.0",
"friends-of-behat/variadic-extension": "^1.0",
"lakion/mink-debug-extension": "^1.2.3",
"se/selenium-server-standalone": "^2.52"
"se/selenium-server-standalone": "^2.52",
"symplify/easy-coding-standard": "^2.4",
"sylius-labs/coding-standard": "^1.0"
},
"prefer-stable": true,
"minimum-stability": "alpha",
"autoload": {
"psr-4": {
"BitBag\\CmsPlugin\\": "src/",
"Tests\\BitBag\\CmsPlugin\\": "tests/"
}
},
"autoload-dev": {
"classmap": ["tests/Application/app/AppKernel.php"]
},
"config": {
"bin-dir": "bin"
}
}
}
Loading