Skip to content
This repository was archived by the owner on Jul 28, 2025. It is now read-only.

Commit 49e799f

Browse files
committed
Merge branch 'develop' of github.com:yawik/StackoverflowApi into travis-fix
2 parents b0e1bcd + 14ba113 commit 49e799f

File tree

19 files changed

+89
-49
lines changed

19 files changed

+89
-49
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ before_script:
4949
composer run serve --timeout=0 > /dev/null 2>&1 &
5050
sleep 3;
5151
fi'
52-
- mkdir -p build/behat
5352

5453
script:
5554
- 'if [[ $COVERAGE = yes ]]; then
5655
./vendor/bin/phpunit --verbose --coverage-clover=build/logs/clover.xml --coverage-php=build/logs/clover.serialized;
5756
else
5857
./vendor/bin/phpunit --verbose;
58+
./vendor/bin/behat;
5959
fi'
6060

6161
after_failure:

README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,7 @@ Requirements
1313

1414
Installation
1515
------------
16-
17-
Checkout this repository into you modules directory of your YAWIK installation and enable the module by:
18-
19-
<pre>
20-
cp modules/StackoverflowApi/config/StackoverflowApi.module.php.dist config/autoload/StackoverflowApi.module.php
21-
</pre>
22-
23-
Or install the module using composer
16+
Install the module using composer
2417

2518
<pre>
2619
composer require yawik/stackoverflow-api

behat.yml.dist

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# This file is part of the YAWIK Project
2+
# (c) 2013 - 2016 Cross Solution (http://cross-solution.de)
3+
4+
default:
5+
formatters:
6+
progress:
7+
verbose: true
8+
paths: false
9+
extensions:
10+
Lakion\Behat\MinkDebugExtension:
11+
directory: "%paths.base%/build/behat"
12+
clean_start: true
13+
screenshot: true
14+
15+
Novaway\CommonContexts\Extension: ~
16+
17+
Behat\MinkExtension:
18+
# change this base url value to match
19+
# your local development server url:
20+
base_url: "http://localhost:8000"
21+
javascript_session: chrome
22+
sessions:
23+
chrome:
24+
selenium2:
25+
browser: chrome
26+
capabilities:
27+
browserName: chrome
28+
browser: chrome
29+
version: ""
30+
chrome:
31+
switches:
32+
- "--headless"
33+
- "--disable-gpu"
34+
- "--window-size=2000,2000"
35+
- "--lang=en"
36+
- "--no-sandbox"
37+
show_auto: false
38+
39+
suites:
40+
user:
41+
contexts:
42+
- Behat\MinkExtension\Context\MinkContext
43+
- Yawik\Behat\CoreContext
44+
- Yawik\Behat\UserContext
45+
- Yawik\Behat\SummaryFormContext

build/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
behat/*
2+
!behat/.gitkeep
3+
logs

build/behat/.gitkeep

Whitespace-only changes.

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"yawik/core": "^0.32@dev"
2727
},
2828
"require-dev": {
29-
"phpunit/phpunit": "^5.7"
29+
"phpunit/phpunit": "^5.7",
30+
"yawik/behat": "^0.32@dev"
3031
},
3132
"autoload": {
3233
"psr-4": {
@@ -54,7 +55,7 @@
5455
"post-update-cmd": [
5556
"@auto-scripts"
5657
],
57-
"serve": "APPLICATION_ENV=development php -S localhost:8000 -t test/sandbox/public",
58+
"serve": "php -S localhost:8000 -t test/sandbox/public",
5859
"start-selenium": "./vendor/bin/selenium-server-standalone -p 4444 -Dwebdriver.chrome.driver=./vendor/bin/chromedriver",
5960
"test": "phpunit"
6061
},

features/check-install.feature

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Feature: Application installed
2+
3+
Scenario: Check installation
4+
Given I am on the homepage
5+
Then I should see "Welcome to YAWIK!"
6+
Given there is a user "test@example.com" identified by "test"
7+
When I want to log in
8+
And I specify the username as "test@example.com"
9+
And I specify the password as "test"
10+
And I log in
11+
And I should see "You are now logged in"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "yawik-orders",
2+
"name": "yawik-stackoverflow-api",
33
"version": "0.32.0",
44
"scripts": {
55
"postinstall": "grunt"

phpunit.xml.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<phpunit bootstrap="./vendor/autoload.php" colors="true">
44
<php>
55
<env name="APPLICATION_ENV" value="test"/>
6-
<env name="APP_CONFIG_DIR" value="./test/config"/>
76
</php>
87
<filter>
98
<whitelist>

test/config/autoload/.gitignore

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

0 commit comments

Comments
 (0)