summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-12-01 15:20:04 +0100
committerRemi Collet <fedora@famillecollet.com>2015-12-01 15:20:04 +0100
commit0a6bc0c7c1e6ea72343c53df61990798a249f56f (patch)
treeb71a0a135d4a43536aef50fc0dd95d9e80af963f
parent364911316c742558f5e096a2e9f03b99d0ef29e7 (diff)
php-behat-mink: 1.7.0 - add backport stuff for remi repo
-rw-r--r--Makefile4
-rw-r--r--php-behat-mink.spec29
2 files changed, 25 insertions, 8 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..91b0fd5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../../common/Makefile
+
diff --git a/php-behat-mink.spec b/php-behat-mink.spec
index d0117a6..435455f 100644
--- a/php-behat-mink.spec
+++ b/php-behat-mink.spec
@@ -1,3 +1,4 @@
+# remirepo spec for php-guzzlehttp-ringphp, from Fedora:
#
# Fedora spec file for php-behat-mink
#
@@ -43,6 +44,7 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{githu
# Modify driver testsuite bootstrap
Patch0: %{name}-driver-testsuite-bootstrap.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Tests
%if %{with_tests}
@@ -100,6 +102,7 @@ Autoloader: %{phpdir}/Behat/Mink/autoload.php
%package driver-testsuite
Summary: Mink driver testsuite
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
# phpcompatinfo (computed from version 1.7.0)
@@ -184,6 +187,8 @@ AUTOLOAD
%install
+rm -rf %{buildroot}
+
: Library
mkdir -p %{buildroot}%{phpdir}/Behat/Mink
cp -pr src/* %{buildroot}%{phpdir}/Behat/Mink/
@@ -206,24 +211,29 @@ $fedoraClassLoader = require_once '%{buildroot}%{phpdir}/Behat/Mink/autoload.php
$fedoraClassLoader->addPrefix('Behat\\Mink\\Tests\\', __DIR__);
AUTOLOAD
-%if 0%{?el6}
-: Skip tests requiring PHPUnit with the "willReturn" function
-sed 's/function testCreateNodeElements/function SKIP_testCreateNodeElements/' \
- -i tests/Driver/CoreDriverTest.php
-sed 's/function testGetResponseHeader/function SKIP_testGetResponseHeader/' \
- -i tests/SessionTest.php
-sed 's/function testAddressEqualsEmptyPath/function SKIP_testAddressEqualsEmptyPath/' \
- -i tests/WebAssertTest.php
+%if 0%{?el5}
+sed -e 's/function testEscapedSelectors/function SKIP_testEscapedSelectors/' \
+ -e 's/function testSelectors/function SKIP_testSelectors/' \
+ -i tests/Selector/NamedSelectorTest.php
%endif
: Run tests
%{_bindir}/phpunit --verbose --bootstrap tests-psr0/autoload.php
+
+if which php70; then
+ php70 %{_bindir}/phpunit --verbose --bootstrap tests-psr0/autoload.php
+fi
%else
: Tests skipped
%endif
+%clean
+rm -rf %{buildroot}
+
+
%files
+%defattr(-,root,root,-)
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *.md
@@ -237,5 +247,8 @@ sed 's/function testAddressEqualsEmptyPath/function SKIP_testAddressEqualsEmptyP
%changelog
+* Tue Dec 1 2015 Remi Collet <remi@fedoraproject.org> - 1.7.0-1
+- backport for remi repository
+
* Wed Nov 25 2015 Shawn Iwinski <shawn@iwin.ski> - 1.7.0-1
- Initial package