Permalink
Browse files

comments in scenarios fixed

  • Loading branch information...
1 parent 8bab624 commit 3b7aaa3ee0adb0d356b15e41a4ec155ef345551e @DavertMik DavertMik committed Aug 26, 2012
View
@@ -8,8 +8,10 @@
));
$loader->register(true);
-include_once 'vendor/EHER/PHPUnit/src/phpunit/PHPUnit/Autoload.php';
-include_once 'vendor/autoload.php';
+if (stream_resolve_include_path('vendor/autoload.php')) {
+ include_once 'vendor/EHER/PHPUnit/src/phpunit/PHPUnit/Autoload.php';
+ include_once 'vendor/autoload.php';
+}
// hardcode fix to broken goutte. Fuck this composer and friends!
if (!class_exists('Goutte\Client')) {
View
@@ -15,7 +15,7 @@
"minimum-stability": "dev",
"require":{
"php":">=5.3.2",
- "behat/mink": "1.4@stable",
+ "behat/mink": "*",
"EHER/PHPUnit":">=1.2",
"behat/mink-goutte-driver": "*",
"behat/mink-selenium-driver": "*",
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
@@ -24,7 +24,6 @@ public function wantToTest($text)
public function wantTo($text)
{
- $this->scenario->comment(array('I want to ' . $text));
if ($this->scenario->running()) {
$this->scenario->runStep();
return $this;
@@ -63,7 +62,7 @@ public function testMethod($signature)
public function expectTo($prediction)
{
- $this->scenario->comment(array('I expect to ' . $prediction));
+ $this->scenario->comment('I expect to ' . $prediction);
if ($this->scenario->running()) {
$this->scenario->runStep();
return $this;
@@ -73,7 +72,7 @@ public function expectTo($prediction)
public function expect($prediction)
{
- $this->scenario->comment(array('I expect ' . $prediction));
+ $this->scenario->comment('I expect ' . $prediction);
if ($this->scenario->running()) {
$this->scenario->runStep();
return $this;
@@ -83,7 +82,7 @@ public function expect($prediction)
public function amGoingTo($argumentation)
{
- $this->scenario->comment(array('I am going to ' . $argumentation));
+ $this->scenario->comment('I am going to ' . $argumentation);
if ($this->scenario->running()) {
$this->scenario->runStep();
return $this;
@@ -92,7 +91,7 @@ public function amGoingTo($argumentation)
}
public function am($role) {
- $this->scenario->comment(array('As a ' . $role));
+ $this->scenario->comment('As a ' . $role);
if ($this->scenario->running()) {
$this->scenario->runStep();
return $this;
@@ -102,7 +101,7 @@ public function am($role) {
public function lookForwardTo($role) {
- $this->scenario->comment(array('So that I ' . $role));
+ $this->scenario->comment('So that I ' . $role);
if ($this->scenario->running()) {
$this->scenario->runStep();
return $this;
@@ -7,7 +7,7 @@
class Codecept
{
- const VERSION = "1.1.1";
+ const VERSION = "1.1.2";
/**
* @var \Codeception\PHPUnit\Runner
@@ -98,7 +98,7 @@ public function getFeature() {
}
public function comment($comment) {
- $this->addStep(new \Codeception\Step\Comment("",$comment));
+ $this->addStep(new \Codeception\Step\Comment($comment,array()));
}
public function getCurrentStep()
@@ -95,7 +95,7 @@ protected function formattedTestOutput($test, $long)
}
public function beforeComment(\Codeception\Event\Step $e) {
- if ($this->steps) $this->output->writeln("((".$e->getStep()->__toString()."))");
+ if ($this->steps) $this->output->writeln("\n((".$e->getStep()->__toString()."))");
}
public function afterComment(\Codeception\Event\Step $e) {
View
@@ -1 +1 @@
-a:1:{s:13:"50342bc02eb6c";a:0:{}}
+a:1:{s:13:"503a7e8c31c42";a:0:{}}
@@ -1,18 +0,0 @@
-paths:
- tests: tests
- log: tests/_log
- data: tests/_data
- helpers: tests/_helpers
-settings:
- bootstrap: _bootstrap.php
- suite_class: \PHPUnit_Framework_TestSuite
- colors: false
- memory_limit: 1024M
- log: true
-modules:
- config:
- Db:
- dsn: ''
- user: ''
- password: ''
- dump: tests/_data/dump.sql
@@ -1,42 +0,0 @@
-<?php
-
-class DummyClass
-{
- protected $checkMe = 1;
-
- function __construct($checkMe = 1)
- {
- $this->checkMe = "constructed: ".$checkMe;
- }
-
- public function helloWorld() {
- return "hello";
- }
-
- public function goodByeWorld() {
- return "good bye";
- }
-
- protected function notYourBusinessWorld()
- {
- return "goAway";
- }
-
- public function getCheckMe() {
- return $this->checkMe;
- }
-
- public function call() {
- $this->targetMethod();
- return true;
- }
-
- public function targetMethod() {
- return true;
- }
-
- public function exceptionalMethod() {
- throw new Exception('Catch it!');
- }
-
-}
@@ -1 +0,0 @@
-/* Replace this file with actual dump of your database */
@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-require_once 'PHPUnit/Framework/Assert/Functions.php';
-
-// here you can define custom functions for DumbGuy
-
-class DumbHelper extends \Codeception\Module
-{
-}
No changes.
@@ -1,3 +0,0 @@
-class_name: DumbGuy
-modules:
- enabled: [Filesystem, DumbHelper]
Oops, something went wrong.

0 comments on commit 3b7aaa3

Please sign in to comment.