support codeception 2.0 and up

tiger-seo · Sep 23, 2015 · 02e32d5 · 02e32d5
1 parent 284b914
commit 02e32d5
Show file tree

Hide file tree

Showing 14 changed files with 837 additions and 2,906 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 .idea
-composer.phar
 bin
-tests/_log/*
-!tests/_log/.gitkeep
+tests/_output/*
+tests/_support/_generated/*
 vendor
+composer.phar
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,11 @@ language: php
 php:
   - 5.4
   - 5.5
+  - 5.6
 
 env:
-  - CODECEPTION_VERSION="1.6.*"
-  - CODECEPTION_VERSION="1.7.*"
-  - CODECEPTION_VERSION="dev-master"
+  - CODECEPTION_VERSION="2.0.*"
+  - CODECEPTION_VERSION="2.1.*"
 
 before_script:
   - composer self-update

diff --git a/codeception.yml b/codeception.yml
@@ -1,18 +1,14 @@
+actor: Tester
 paths:
     tests: tests
-    log: tests/_log
+    log: tests/_output
     data: tests/_data
-    helpers: tests/_helpers
+    support: tests/_support
+    envs: tests/_envs
 settings:
     bootstrap: _bootstrap.php
-    suite_class: \PHPUnit_Framework_TestSuite
     colors: true
     memory_limit: 1024M
-    log: true
-modules:
-    config:
-        PhpBrowser:
-            url: http://localhost:8000
 extensions:
     enabled:
         - Codeception\Extension\PhpBuiltinServer
@@ -24,3 +20,7 @@ extensions:
             documentRoot: tests/_data
         Codeception\Extension\RemoteDebug:
             sessionName: XDEBUG_TIGER
+modules:
+    config:
+        PhpBrowser:
+            url: http://localhost:8000
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
 		}
 	],
 	"require-dev"      : {
-		"codeception/codeception"     : ">=1.6.0",
+		"codeception/codeception"     : "~2.0",
 		"codeception/phpbuiltinserver": "dev-master"
 	},
 	"autoload"         : {