From 0341c9c5ebd3e267855d56727a70138233e0666a Mon Sep 17 00:00:00 2001 From: Lars Henrik Mai Date: Wed, 4 May 2016 22:41:45 +0200 Subject: [PATCH] Update travis config to use run-tests script And the README as well for good measure. --- .travis.yml | 4 ++-- README.md | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36dbd57..73cfa9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: bundler services: - docker - + script: - docker-compose run web rake db:setup - - docker-compose run -e CI=true -e TRAVIS=true -e TRAVIS_BRANCH=$TRAVIS_BRANCH -e TRAVIS_COMMIT=$TRAVIS_COMMIT -e TRAVIS_JOB_NUMBER=$TRAVIS_JOB_NUMBER -e TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST -e TRAVIS_JOB_ID=$TRAVIS_JOB_ID -e TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG web rspec + - docker-compose run -e CI=true -e TRAVIS=true -e TRAVIS_BRANCH=$TRAVIS_BRANCH -e TRAVIS_COMMIT=$TRAVIS_COMMIT -e TRAVIS_JOB_NUMBER=$TRAVIS_JOB_NUMBER -e TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST -e TRAVIS_JOB_ID=$TRAVIS_JOB_ID -e TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG web bin/run-tests diff --git a/README.md b/README.md index 1fa8178..14303d8 100644 --- a/README.md +++ b/README.md @@ -6,24 +6,24 @@ ## Usage / Features -The Stadtratmonitor Leipzig is a lightweight user interface for performing full text searches against paper contents issued to the city council of Leipzig. Note, this solution uses the data from [Ratsinformationssystem Leipzig](https://ratsinfo.leipzig.de/bi/allris.net.asp) that also offers [text search capabilities](https://ratsinfo.leipzig.de/bi/yw010.asp). +The Stadtratmonitor Leipzig is a lightweight user interface for performing full text searches against paper contents issued to the city council of Leipzig. Note, this solution uses the data from [Ratsinformationssystem Leipzig](https://ratsinfo.leipzig.de/bi/allris.net.asp) that also offers [text search capabilities](https://ratsinfo.leipzig.de/bi/yw010.asp). ### Sorting * Sort by date, paper was issued - + ![Papers sorted by publishing date](https://cloud.githubusercontent.com/assets/994131/14060246/b29c0356-f35e-11e5-837a-2106dd274694.JPG) * Sort by relevance, e.g. how often the search keyword appears inside the title resp. the content of the paper - + ![Papers sorted by relevance](https://cloud.githubusercontent.com/assets/994131/14060257/f7491002-f35e-11e5-9d39-f36b81c35c33.JPG) ### Filtering * By paper type - + ![Filter by paper type](https://cloud.githubusercontent.com/assets/994131/14060263/28c9d800-f35f-11e5-8c56-e8d208d85916.JPG) * By originator - + ![Filter by originator](https://cloud.githubusercontent.com/assets/994131/14060267/4fa539a6-f35f-11e5-981e-2467daf2dee2.JPG) ### Staying up-to-date @@ -38,7 +38,7 @@ The Stadtratmonitor Leipzig is a lightweight user interface for performing full #### Example using Firefox and RSSOWL Click on the newsfeed icon in the address bar -![Abonnieren mit Firefox](https://cloud.githubusercontent.com/assets/994131/14060508/fe7f4514-f366-11e5-85ae-2fa2e50b91ea.JPG) +![Abonnieren mit Firefox](https://cloud.githubusercontent.com/assets/994131/14060508/fe7f4514-f366-11e5-85ae-2fa2e50b91ea.JPG) Copy the URL from the address bar ![RSS URL in Firefox](https://cloud.githubusercontent.com/assets/994131/14060515/30140e98-f367-11e5-9c77-86ba626e3c1b.JPG) @@ -76,3 +76,9 @@ docker. Edit the morph.yml file and insert the Morph API key 1. Import the data from our scraper: `docker-compose run web rake import_papers` 1. Build the elasticsearch index: `docker-compose run web rake index:rebuild` + +### Running tests + +Assuming docker and docker-compose is installed: + +1. `docker-compose run web bin/run-tests`