Skip to content

Commit 1173b83

Browse files
committed
Merge branch 'master' of github.com:Codeception/codeception.github.com
2 parents 4762547 + b86446f commit 1173b83

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1463
-4204
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ _site/
55
/composer.lock
66
Gemfile.lock
77
/docs/modules/AbstractAsserts.md
8+
/docs/modules/Phalcon.md
9+
/docs/modules/Phalcon4.md
810
/package/composer.lock
911
/package/vendor
1012
/vendor

RoboFile.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,12 @@ public function buildDocsModules()
128128
$this->taskFilesystemStack()->symlink('Mezzio.md', 'docs/modules/ZendExpressive.md')->run();
129129
$this->taskFilesystemStack()->symlink('Laravel.md', 'docs/modules/Laravel5.md')->run();
130130
$this->taskFilesystemStack()->symlink('Laminas.md', 'docs/modules/ZF2.md')->run();
131+
132+
// Don't update old Phalcon modules
133+
$this->taskGitStack()
134+
->stopOnFail()
135+
->checkout('-- docs/modules/Phalcon.md docs/modules/Phalcon4.md')
136+
->run();
131137
}
132138

133139
private function postProcessModuleDocFile($documentationFile, $name, $source)
@@ -573,7 +579,6 @@ private function setCodeceptionVersionTo($version)
573579
{
574580
$this->taskComposerRequire()
575581
->dependency('codeception/codeception', $version)
576-
->ignorePlatformRequirements()
577582
->workingDir('package')
578583
->run();
579584
}
@@ -603,6 +608,7 @@ private function packPhar($pharFileName)
603608
$finder = Finder::create()->files()
604609
->ignoreVCS(true)
605610
->name('*.php')
611+
->name('*.php8')
606612
->name('*.css')
607613
->name('*.png')
608614
->name('*.js')

_includes/extensions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ extensions:
6868

6969
[See Source](https://github.com/Codeception/Codeception/blob/5.0/ext/Recorder.php)
7070

71-
Saves a screenshot of each step in acceptance tests and shows them as a slideshow on one HTML page (here's an [example](http://codeception.com/images/recorder.gif))
71+
Saves a screenshot of each step in acceptance tests and shows them as a slideshow on one HTML page (here's an [example](https://codeception.com/images/recorder.gif))
7272
Activated only for suites with WebDriver module enabled.
7373

7474
The screenshots are saved to `tests/_output/record_*` directories, open `index.html` to see them as a slideshow.
@@ -116,7 +116,7 @@ It is also possible to skip recording of steps for specified tests by using the
116116
public function testLogin(AcceptanceTester $I)
117117
{
118118
$I->login();
119-
$I->amOnUrl('http://codeception.com');
119+
$I->amOnUrl('https://codeception.com');
120120
}
121121
```
122122

_posts/2013-10-04-specification-phpunit.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Now we've got a list of specification and code examples for each case. If one da
9797

9898
Please note, that all the specification are grouped by context. In plain PHPUnit you would create each code block as a separate method. This way it's pretty hard to all the tests related to one specific feature, in our case - publishing.
9999

100-
Ok, we got nice specifications. But can we also replace classical asserts with some more BDD stuff? Sure. We have another tiny package [Verify](https://github.com/Codeception/Verify) which is also inspired by Jasmine. `Assert` keyword is replaced either with `expect` (as Jasmine does) or `verify`. This asserts change the order of assetion to improve readability.
100+
Ok, we got nice specifications. But can we also replace classical asserts with some more BDD stuff? Sure. We have another tiny package [Verify](https://github.com/Codeception/Verify) which is also inspired by Jasmine. `Assert` keyword is replaced either with `expect` (as Jasmine does) or `verify`. This asserts change the order of assertion to improve readability.
101101

102102
Let's rewrite our test with **Verify** so you could feel the difference.
103103

@@ -162,4 +162,4 @@ php composer.phar require "codeception/verify:*" --dev
162162
To introduce `specify` codeblocks, just add `use Codeception\Specify` into any TestCase file.
163163
BDD styled assertions with `expect` keywords are installed automatically.
164164

165-
**Hint:** Isolated codeblocks are especially useful [for testing exceptions](https://github.com/Codeception/Specify#exceptions).
165+
**Hint:** Isolated codeblocks are especially useful [for testing exceptions](https://github.com/Codeception/Specify#exceptions).

_posts/2022-07-02-codeception-5.markdown

Lines changed: 0 additions & 172 deletions
This file was deleted.

0 commit comments

Comments
 (0)