Justin Holm solution

Gemfile.lock

@@ -40,10 +40,19 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
+    sass (3.4.23)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -66,5 +75,10 @@ DEPENDENCIES
   cucumber-sinatra
   haml
   pry
+  rspec
   rspec-expectations
+  sass
   sinatra
+
+BUNDLED WITH
+   1.14.6

app.rb

@@ -31,7 +31,12 @@ def logged_in?
   end
 
   get "/dashboard" do
-    @username = session[:user]
-    haml :dashboard
+    if logged_in?
+      @username = session[:user]
+      haml :dashboard
+    else
+      @message = 'Please sign in to view this page'
+      haml :index
+    end
   end
 end

features/login.feature

@@ -7,4 +7,13 @@ Feature: Login Page
     Given the login page
     When I log in with proper credentials
     Then I should see the secret page
-
+
+  Scenario: Un-Authenticated User
+    Given the login page
+    When I log in without proper credentials
+    Then I should see the error message
+
+  Scenario: No Credentials
+    Given the login page
+    When I log in with no credentials
+    Then I should see the error message for no credentials

features/logout.feature

@@ -1 +1,9 @@
-#Add your codez here
+Feature: Logout Page
+  In order to keep my page secret after using
+  As a user that is logged in
+  I want to log out from my private page
+
+  Scenario: Authenticated User
+    Given the secret page
+    When I log out
+    Then I should see the login page with the logout message

features/step_definitions/login_steps.rb

@@ -1,14 +1,34 @@
+user = "jholm"
+
 Given(/^the login page$/) do
-  #put your code here
-  pending
+  visit '/'
 end
 
 When(/^I log in with proper credentials$/) do
-  #put your code here
-  pending
+  fill_in('username', with: user)
+  fill_in('password', with: user)
+  click_button('Login')
 end
 
 Then(/^I should see the secret page$/) do
-  #put your code here
-  pending
+  expect(page).to have_content("Your username is #{user}.")
+  expect(page).to have_content("Your info")
+end
+
+When(/^I log in without proper credentials$/) do
+  fill_in('username', with: user)
+  fill_in('password', with: "password")
+  click_button('Login')
+end
+
+Then(/^I should see the error message$/) do
+  expect(page).to have_content("Your username & password did not match")
+end
+
+When(/^I log in with no credentials$/) do
+  visit '/dashboard'
+end
+
+Then(/^I should see the error message for no credentials$/) do
+  expect(page).to have_content("Please sign in to view this page")
 end

features/step_definitions/logout_steps.rb

@@ -1 +1,13 @@
-#Add your codez here
+Given(/^the secret page$/) do
+  step 'the login page'
+  step 'I log in with proper credentials'
+  step 'I should see the secret page'
+end
+
+When(/^I log out$/) do
+  click_link('Logout')
+end
+
+Then(/^I should see the login page with the logout message$/) do
+  expect(page).to have_content("You have been logged out")
+end