Updated versions and temporarily removed behat tests from travis

DixonsCz · May 23, 2014 · 219e266 · 219e266
1 parent ec098fe
commit 219e266
Show file tree

Hide file tree

Showing 5 changed files with 1,974 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .idea
 vendor/
 app/config/secret.neon
-composer.lock
 temp/*
 log/*
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ before_script:
 
 script:
     - phpunit --coverage-clover=coverage.clover
-    - vendor/bin/behat
+#    - vendor/bin/behat
 
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar

diff --git a/behat.yml b/behat.yml
@@ -11,5 +11,4 @@ default:
       default_session: goutte
       javascript_session: selenium2
       goutte: ~
-      selenium2: ~
-      zombie: ~
+      selenium2: ~
diff --git a/composer.json b/composer.json
@@ -1,18 +1,17 @@
 {
 	"name": "DixonsCz/chuck",
 	"require": {
-		"nette/nette": "~2.1",
-		"kdyby/curl": "@stable",
-		"monolog/monolog": "~1.8"
+		"nette/nette": "2.1.*",
+		"kdyby/curl": "*",
+		"monolog/monolog": "1.8.*"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "3.7.*",
-		"behat/behat": "*",
-		"behat/mink": "*",
+		"behat/behat": "2.5.*",
+		"behat/mink": "1.5.*",
 		"behat/mink-extension": "*",
-		"behat/mink-goutte-driver": "*",
-		"behat/mink-selenium2-driver": "*",
-		"behat/mink-zombie-driver": "*"
+		"behat/mink-goutte-driver": "1.0.9",
+		"behat/mink-selenium2-driver": "1.1.*"
 	},
 	"autoload": {
 		"classmap": ["app/", "components/"]