merged with master

Author: DavertMik

src/Codeception/Module/Sequence.php

@@ -11,7 +11,8 @@
  * you can use generated unique names, that should not conflict.
  * When you create article on a site, for instance, you can assign it a unique name and then check it.
  *
- * This module has no actions, but introduces a function `sq` for generating unique sequences.
+ * This module has no actions, but introduces a function `sq` for generating unique sequences within test and
+ * `sqs` for generating unique sequences across suite.
  *
  * ### Usage
  *
@@ -50,19 +51,49 @@
  * ?>
  * ```
  *
+ * Cest Suite tests:
+ *
+ * ``` php
+ * <?php
+ * class UserTest
+ * {
+ *     public function createUser(AcceptanceTester $I)
+ *     {
+ *         $I->createUser('email' . sqs('user') . '@mailserver.com', sqs('login'), sqs('pwd'));
+ *     }
+ *
+ *     public function checkEmail(AcceptanceTester $I)
+ *     {
+ *         $I->seeInEmailTo('email' . sqs('user') . '@mailserver.com', sqs('login'));
+ *     }
+ *
+ *     public function removeUser(AcceptanceTester $I)
+ *     {
+ *         $I->removeUser('email' . sqs('user') . '@mailserver.com');
+ *     }
+ * }
+ * ?>
+ * ```
  */
 class Sequence extends CodeceptionModule
 {
-    public static $hash = array();
+    public static $hash = [];
+    public static $suiteHash = [];
 
     public function _after(TestInterface $t)
     {
         self::$hash = [];
     }
+
+    public function _afterSuite()
+    {
+        self::$suiteHash = [];
+    }
 }
 
-if (!function_exists('sq')) {
+if (!function_exists('sq') && !function_exists('sqs')) {
     require_once __DIR__ . '/../Util/sq.php';
+    require_once __DIR__ . '/../Util/sqs.php';
 } else {
-    throw new ModuleException('Codeception\Module\Sequence', "function 'sq' already defined");
+    throw new ModuleException('Codeception\Module\Sequence', "function 'sq' and 'sqs' already defined");
 }

tests/unit/Codeception/Module/SequenceTest.php

@@ -14,4 +14,16 @@ public function testSequences()
         $this->assertNotEquals($old, sq(1));
     }
 
+    public function testSuiteSequences()
+    {
+        $module = new \Codeception\Module\Sequence(make_container());
+        $this->assertNotEquals(sqs(), sqs());
+        $this->assertNotEquals(sqs(1), sqs(2));
+        $this->assertEquals(sqs(1), sqs(1));
+        $old = sqs(1);
+        $module->_after($this);
+        $this->assertEquals($old, sqs(1));
+        $module->_afterSuite();
+        $this->assertNotEquals($old, sqs(1));
+    }
 }