Merge branch '1.0' into 1.1

This commit is contained in:
Daniel Hensby 2018-03-07 11:29:03 +00:00
commit 6e49a3e01e
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
3 changed files with 23 additions and 1 deletions

20
.travis.yml Normal file
View File

@ -0,0 +1,20 @@
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
language: php
dist: precise
php:
- 5.3
env:
- DB=MYSQL CORE_RELEASE=3.0
- DB=PGSQL CORE_RELEASE=3.0
before_script:
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss
script:
- phpunit googlesitemaps/tests/

View File

@ -1,5 +1,7 @@
# Google Sitemaps Module # Google Sitemaps Module
[![Build Status](https://secure.travis-ci.org/wilr/silverstripe-googlesitemaps.png?branch=1.1)](http://travis-ci.org/wilr/silverstripe-googlesitemaps)
## Maintainer Contact ## Maintainer Contact
* Will Rossiter (Nickname: wrossiter, willr) <will@fullscreen.io> * Will Rossiter (Nickname: wrossiter, willr) <will@fullscreen.io>

View File

@ -95,7 +95,7 @@ class GoogleSitemapTest extends FunctionalTest {
GoogleSitemap::register_dataobject("GoogleSitemapTest_DataObject"); GoogleSitemap::register_dataobject("GoogleSitemapTest_DataObject");
DB::query(" DB::query("
UPDATE GoogleSitemapTest_DataObject SET LastEdited = '2012-01-14'" UPDATE \"GoogleSitemapTest_DataObject\" SET \"LastEdited\" = '2012-01-14'"
); );
$response = $this->get('sitemap.xml'); $response = $this->get('sitemap.xml');