simplify dev setup

Author: MSzweda

.rspec

@@ -1,2 +1,3 @@
 --color
 --require spec_helper
+-f d

README.md

@@ -3,31 +3,41 @@ Introduction to acceptance testing
 
 FORK THE PROJECT!
 
-# Database setup
+# Dependencies
+**Download and set these up first.**
+
+- ruby 2.1.5
+- postgres
 
-We're using postgres. Make sure it's running :)
+## Gem dependencies
+- capybara webkit driver (you will need QT)
+[Webkit as js driver for cabypara](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit)
+
+# Database setup
+We're using postgres. Make sure it's running :) Then log in to template with this command line:
 
-Ubuntu: `sudo -u postgres psql template1`  
+Ubuntu: `sudo -u postgres psql template1`
 OSX: `psql template1`
 
-**Fill in your desired password** in the `db/development_setup_script.sql` - if you leave it empty you might have to [change your hba_conf](https://gist.github.com/p1nox/4953113).
+You will now be in psql command line. After that in the console run the development setup script - this script is already filled in with passwords, etc. If you want to change any of the information in there you will need to change it also in database.yml later!
 
-Then in the pql console run: `\i <PATH_TO_PROJECT>/db/development_setup_script.sql`  
+In the pql console run: `\i <PATH_TO_PROJECT>/db/development_setup_script.sql`
 Exit console by typing `\q`
 
-**Copy database.yml.sample to database.yml and fill in the password you chose earlier.**
+**Copy database.yml.sample to database.yml**:
+`cp config/database.yml.sample config/database.yml`
 
-Run `bundle install`  
+Run `bundle install`
 Then `rake db:reseed` to populate development environment with example data.
+Load test database with `rake db:test:load`.
 
-# Gem dependencies
-
-[Webkit as js driver for cabypara](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit)
 
 # Credentials
-Seeds have a user already created for you.  
+**Seeds have a user already created for you.**
 `[email protected]` with password `12345678`
 
 # Run
-
 `rails s`
+
+# Run specs (if any)
+`rspec spec`

config/database.yml.sample

@@ -2,7 +2,7 @@ defaults: &defaults
   adapter: postgresql
   host: localhost
   username: howdoiqa
-  password: <YOUR PASSWORD HERE>
+  password: howdoiqa
 
 development:
   <<: *defaults

db/development_setup_script.sql

@@ -1,7 +1,7 @@
 CREATE DATABASE "howdoiqa_development";
 CREATE DATABASE "howdoiqa_test";
 
-CREATE USER howdoiqa WITH PASSWORD '<YOUR PASSWORD HERE>';
+CREATE USER howdoiqa WITH PASSWORD 'howdoiqa';
 
 GRANT ALL PRIVILEGES ON DATABASE howdoiqa_development TO howdoiqa;
 GRANT ALL PRIVILEGES ON DATABASE howdoiqa_test TO howdoiqa;