Update composer.jsons and travis configuration

This commit is contained in:
Paweł Jędrzejewski 2014-04-21 20:15:21 +02:00
parent 1f9ea020f2
commit e41647be4b
6 changed files with 28 additions and 17 deletions

View file

@ -19,11 +19,11 @@ before_script:
- echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- ulimit -n 10000
- sudo apt-get update
- sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl wkhtmltopdf
- sudo sed -i -e "s,/var/www,$(pwd)/web,g" /etc/apache2/sites-available/default
- export MINK_EXTENSION_PARAMS='base_url=http://localhost:8000/app_test.php'
- sudo /etc/init.d/apache2 restart
# - sudo apt-get update
# - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl wkhtmltopdf
# - sudo sed -i -e "s,/var/www,$(pwd)/web,g" /etc/apache2/sites-available/default
# - export MINK_EXTENSION_PARAMS='base_url=http://localhost:8000/app_test.php'
# - sudo /etc/init.d/apache2 restart
- composer self-update
- composer require doctrine/mongodb-odm="1.0.*@dev" --no-update
- composer require jmikola/geojson="~1.0" --no-update
@ -34,15 +34,16 @@ before_script:
- app/console doctrine:schema:create --env=test > /dev/null
- app/console doctrine:phpcr:repository:init --env=test > /dev/null
- app/console cache:warmup --env=test > /dev/null
- sh -e /etc/init.d/xvfb start
- export DISPLAY=:99
- wget http://selenium-release.storage.googleapis.com/2.41/selenium-server-standalone-2.41.0.jar
- java -jar selenium-server-standalone-2.41.0.jar > /dev/null &
- sleep 5
# - sh -e /etc/init.d/xvfb start
# - export DISPLAY=:99
# - wget http://selenium-release.storage.googleapis.com/2.41/selenium-server-standalone-2.41.0.jar
# - java -jar selenium-server-standalone-2.41.0.jar > /dev/null &
# - sleep 5
script:
- bin/phpspec run -f dot
- php -d memory_limit=2048M bin/behat --stop-on-failure --tags '@pricing && ~@javascript'
- php -d memory_limit=2048M bin/behat --stop-on-failure --tags '@account && ~@javascript'
- php -d memory_limit=2048M bin/behat --stop-on-failure --tags '@addressing && ~@javascript'
- php -d memory_limit=2048M bin/behat --stop-on-failure --tags '@cart && ~@javascript'
@ -63,5 +64,5 @@ script:
- php -d memory_limit=2048M bin/behat --stop-on-failure --tags '@users && ~@javascript,@oauth'
notifications:
email: "travis-ci@sylius.org"
irc: "irc.freenode.org#sylius-dev"
email: "travis-ci@sylius.org"
irc: "irc.freenode.org#sylius-dev"

View file

@ -9,8 +9,10 @@ suites:
Order : { namespace: Sylius, spec_path: src/Sylius/Component/Order }
Payment : { namespace: Sylius, spec_path: src/Sylius/Component/Payment }
Payum : { namespace: Sylius, spec_path: src/Sylius/Component/Payum }
Pricing : { namespace: Sylius, spec_path: src/Sylius/Component/Pricing }
Product : { namespace: Sylius, spec_path: src/Sylius/Component/Product }
Promotion : { namespace: Sylius, spec_path: src/Sylius/Component/Promotion }
Registry : { namespace: Sylius, spec_path: src/Sylius/Component/Registry }
Resource : { namespace: Sylius, spec_path: src/Sylius/Component/Resource }
Settings : { namespace: Sylius, spec_path: src/Sylius/Component/Settings }
Shipping : { namespace: Sylius, spec_path: src/Sylius/Component/Shipping }
@ -28,6 +30,7 @@ suites:
OrderBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/OrderBundle }
PaymentBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PaymentBundle }
PayumBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PayumBundle }
PricingBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PricingBundle }
ProductBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/ProductBundle }
PromotionBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PromotionBundle }
ResourceBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/ResourceBundle }

View file

@ -24,6 +24,7 @@
"stof/doctrine-extensions-bundle": "1.1.*",
"sylius/pricing": "0.10.*@dev"
"sylius/registry": "0.10.*@dev",
"sylius/resource-bundle": "0.10.*@dev",
"symfony/framework-bundle": "~2.3"
},

View file

@ -22,10 +22,11 @@
"require": {
"php": ">=5.3.3",
"symfony/framework-bundle": "~2.3",
"stof/doctrine-extensions-bundle": "1.1.*",
"sylius/promotion": "0.10.*@dev",
"sylius/registry": "0.10.*@dev",
"sylius/resource-bundle": "0.10.*@dev",
"sylius/promotion": "0.10.*@dev"
"symfony/framework-bundle": "~2.3"
},
"require-dev": {
"phpspec/phpspec": "~2.0",

View file

@ -2,7 +2,7 @@
"name": "sylius/pricing",
"type": "library",
"description": "Pricing component for PHP e-commerce applications.",
"keywords": ["shop", "ecommerce", "attribute", "feature"],
"keywords": ["shop", "ecommerce", "price", "pricing"],
"homepage": "http://sylius.org",
"license": "MIT",
"authors": [
@ -22,7 +22,8 @@
"require": {
"php": ">=5.3.3",
"sylius/resource": "0.10.*@dev"
"sylius/resource": "0.10.*@dev",
"sylius/registry": "0.10.*@dev"
},
"require-dev": {
"phpspec/phpspec": "2.0.*"
@ -31,7 +32,10 @@
"bin-dir": "bin"
},
"autoload": {
"psr-0": { "Sylius\\Component\\Pricing\\": "" }
"psr-4": { "Sylius\\Component\\Pricing\\": "" }
},
"autoload-dev": {
"psr-4": { "spec\\Sylius\\Component\\Pricing\\": "spec/" }
},
"target-dir": "Sylius/Component/Pricing",
"extra": {

View file

@ -22,6 +22,7 @@
"require": {
"php": ">=5.3.3",
"sylius/registry": "0.10.*@dev",
"sylius/resource": "0.10.*@dev"
},
"require-dev": {