Document Continuous Integration Information

Author: eliotsykes

.travis.yml

@@ -5,17 +5,16 @@
 #    to access your GitHub repositories.
 # 3. Create a file like this one you're reading at `your-rails-app/.travis.yml`:
 
-
 language: ruby
 rvm:
   - 2.2.2
   # Add more Ruby versions to list if supported,
   # Travis supports these versions: http://rubies.travis-ci.org/
 
 addons:
-  firefox: "37.0.2" # Set Firefox Version
+  firefox: "37.0.2" # Set Firefox Version if needed.
 
-# Use xvfb to setup fake monitor display so Firefox GUI can be used by specs:
+# If needed, use xvfb to setup fake monitor display so Firefox GUI can be used by specs:
 # http://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to-Run-Tests-That-Require-GUI-(e.g.-a-Web-browser)
 before_install:
   - "export DISPLAY=:99.0"
@@ -31,10 +30,14 @@ before_install:
 # script:
 #   - rake # `rake` is the Travis default, which runs `rake test`
 
+# 5. OPTIONAL Add a Build Status Badge to your README, follow instructions here:
+#    http://docs.travis-ci.com/user/status-images/
+
 # Suggested docs
 # --------------
 # Getting Started: http://docs.travis-ci.com/user/getting-started/
 # Ruby & Travis CI docs: http://docs.travis-ci.com/user/languages/ruby/
 # Supported Ruby Versions: http://rubies.travis-ci.org/
 # Custom build task: http://docs.travis-ci.com/user/customizing-the-build/
-# GUI, Browsers, xvfb: http://docs.travis-ci.com/user/gui-and-headless-browsers/
+# GUI, Browsers, xvfb: http://docs.travis-ci.com/user/gui-and-headless-browsers/
+# Build Status Badge for README: http://docs.travis-ci.com/user/status-images/

CHANGELOG.md

@@ -1,6 +1,6 @@
-# In Progress
-- Introduce Continuous Integration to the project with Travis CI 
-- Add Travis CI build status badge to README
+# 1/May/2015
+- Introduce Continuous Integration to the project with Travis CI https://github.com/eliotsykes/rspec-rails-examples/pull/58 (Eliot Sykes)
+- Add Travis CI build status badge to README https://github.com/eliotsykes/rspec-rails-examples/pull/58 (Eliot Sykes)
 
 # 27/Apr/2015
 - Remove nested expectation to make spec more understandable https://github.com/eliotsykes/rspec-rails-examples/pull/54 (Andy Waite)

README.md

@@ -48,7 +48,7 @@ Hopefully this will be of help to those of you learning RSpec and Rails. If ther
   - [Helper Specs & Docs](#helper-specs--docs)
   - [Routing Specs & Docs](#routing-specs--docs)
 - [Enable Spring for RSpec](#enable-spring-for-rspec)
-- [Continuous Integration with Travis CI](#continuous-integration-with-travis-ci)
+- [Automated Continuous Integration with Travis CI](#automated-continuous-integration-with-travis-ci)
 - [Contributors](#contributors)
 
 <!-- /MarkdownTOC -->
@@ -267,13 +267,18 @@ bin/rspec
 See the spring-commands-rspec README for up-to-date installation instructions:
 https://github.com/jonleighton/spring-commands-rspec
 
-# Continuous Integration with Travis CI
+# Automated Continuous Integration with Travis CI
+
+Continuous Integration (CI) is the practice of integrating new code into the master branch frequently, to help detect merge conflicts, bugs, and improve the quality of the software a development team writes. 
+
+CI is usually accompanied by running an application's test suite against the latest code changes, and flagging any test failures that are found. Developers are expected to investigate and fix these failures to maintain a passing test suite and therefore quality. 
+
+[Travis CI](https://travis-ci.org) is a build server that helps automate the CI process. Travis CI runs an application's tests against the latest changes pushed to the application's code respository. In this project, Travis CI runs the project's tests (`rake test`) on pull requests and on changes to the master branch.
 
 Travis CI configuration how-to and example:
-- [.travis.yml](.travis.yml)
-- [Our Travis CI Build!](https://travis-ci.org/eliotsykes/rspec-rails-examples)
-- TODO: What is Continous Integration? Why have it?
-- TODO: Travis CI README Badge HOWTO
+- [.travis.yml](.travis.yml) - Travis CI's configuration file (with instructions)
+- [Our Travis CI build!](https://travis-ci.org/eliotsykes/rspec-rails-examples)
+- Our Travis CI badge (hopefully its green): [![Build Status](https://travis-ci.org/eliotsykes/rspec-rails-examples.svg?branch=master)](https://travis-ci.org/eliotsykes/rspec-rails-examples)
 
 ---
 
@@ -283,5 +288,4 @@ Travis CI configuration how-to and example:
 - Vitaly Tatarintsev https://github.com/ck3g
 - Ryan Wold https://afomi.com/
 - Andy Waite http://blog.andywaite.com/
-- Your name here, contributions are welcome and easy, just fork the GitHub repo, make your changes, then submit your pull request! Please ask if you'd like some help.
-
+- Your name here, contributions are welcome and easy, just fork the GitHub repo, make your changes, then submit your pull request! Please ask if you'd like some help.