diff --git a/.gitignore b/.gitignore
index 48fb168f..5a111e4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@
 
 # Ignore Byebug command history file.
 .byebug_history
+
+.env
diff --git a/Gemfile b/Gemfile
index 42f4bb2c..a81c670b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,11 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'dotenv-rails'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+gem "omniauth"
+gem "omniauth-github"
diff --git a/Gemfile.lock b/Gemfile.lock
index 5b407e7e..f66ae74f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,11 +70,18 @@ GEM
     concurrent-ruby (1.0.5)
     crass (1.0.4)
     debug_inspector (0.0.3)
+    dotenv (2.5.0)
+    dotenv-rails (2.5.0)
+      dotenv (= 2.5.0)
+      railties (>= 3.2, < 6.0)
     erubi (1.7.1)
     execjs (2.7.0)
+    faraday (0.15.3)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    hashie (3.5.7)
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     jbuilder (2.7.0)
@@ -84,6 +91,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jwt (2.1.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -113,9 +121,26 @@ GEM
       minitest (~> 5.0)
       rails (>= 4.1)
     multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
     pg (0.21.0)
     popper_js (1.14.3)
     pry (0.11.3)
@@ -207,6 +232,7 @@ DEPENDENCIES
   bootstrap (~> 4.1.3)
   byebug
   coffee-rails (~> 4.2)
+  dotenv-rails
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
@@ -214,6 +240,8 @@ DEPENDENCIES
   minitest-reporters
   minitest-skip
   minitest-spec-rails
+  omniauth
+  omniauth-github
   pg (~> 0.18)
   pry-rails
   puma (~> 3.0)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c12c7c17..b06287b5 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
-  before_action :find_user
+  before_action :find_user, except: [:root]
 
   def render_404
     # DPR: this will actually render a 404 page in production
@@ -14,4 +14,13 @@ def find_user
       @login_user = User.find_by(id: session[:user_id])
     end
   end
+
+  def must_login
+    if @login_user.nil?
+      flash[:status] = :failure
+      flash[:result_test] = 'You must log in to do that'
+
+      redirect_to root_path
+    end
+  end
 end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 5bce99e6..e2510f6a 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,34 +1,85 @@
 class SessionsController < ApplicationController
-  def login_form
-  end
 
-  def login
-    username = params[:username]
-    if username and user = User.find_by(username: username)
-      session[:user_id] = user.id
-      flash[:status] = :success
-      flash[:result_text] = "Successfully logged in as existing user #{user.username}"
+  skip_before_action :find_user, only: [:create]
+
+  def create
+    auth_hash = request.env['omniauth.auth']
+
+    user = User.find_by(uid: auth_hash[:uid], provider: 'github')
+    if user
+      # User was found in the database
+      flash[:status] = "success"
+      flash[:result_text] = "Logged in as existing user #{user.username}"
+      flash[:messages] = user.errors.messages
+
     else
-      user = User.new(username: username)
+      # User doesn't match anything in the DB
+      # Attempt to create a new user
+      user = User.build_from_github(auth_hash)
+
       if user.save
-        session[:user_id] = user.id
-        flash[:status] = :success
-        flash[:result_text] = "Successfully created new user #{user.username} with ID #{user.id}"
+        flash[:status] = "success"
+        flash[:result_text] = "Logged in as #{user.username}"
+        flash[:messages] = user.errors.messages
+
       else
-        flash.now[:status] = :failure
-        flash.now[:result_text] = "Could not log in"
-        flash.now[:messages] = user.errors.messages
-        render "login_form", status: :bad_request
+        # Couldn't save the user for some reason. If we
+        # hit this it probably means there's a bug with the
+        # way we've configured GitHub. Our strategy will
+        # be to display error messages to make future
+        # debugging easier.
+        flash[:status] = "failure"
+        flash[:result_text] = "Could not create user"
+        flash[:messages] = user.errors.messages
+        redirect_to root_path
         return
       end
     end
+
+    # If we get here, we have a valid user instance
+    session[:user_id] = user.id
     redirect_to root_path
   end
 
-  def logout
-    session[:user_id] = nil
-    flash[:status] = :success
-    flash[:result_text] = "Successfully logged out"
-    redirect_to root_path
+  def login_form
   end
+
+  # def login
+  #   username = params[:username]
+  #   if username and user = User.find_by(username: username)
+  #     session[:user_id] = user.id
+  #     flash[:status] = :success
+  #     flash[:result_text] = "Successfully logged in as existing user #{user.username}"
+  #   else
+  #     user = User.new(username: username)
+  #     if user.save
+  #       session[:user_id] = user.id
+  #       flash[:status] = :success
+  #       flash[:result_text] = "Successfully created new user #{user.username} with ID #{user.id}"
+  #     else
+  #       flash.now[:status] = :failure
+  #       flash.now[:result_text] = "Could not log in"
+  #       flash.now[:messages] = user.errors.messages
+  #       render "login_form", status: :bad_request
+  #       return
+  #     end
+  #   end
+  #   redirect_to root_path
+  # end
+  #
+  # def logout
+  #   session[:user_id] = nil
+  #   flash[:status] = :success
+  #   flash[:result_text] = "Successfully logged out"
+  #   redirect_to root_path
+  # end
+
+  def destroy
+  session[:user_id] = nil
+  flash[:status] = "success"
+  flash[:result_text] = "Successfully logged out"
+  # flash[:messages] = user.errors.messages
+
+  redirect_to root_path
+end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 73b42652..42a888b4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,7 @@
 class UsersController < ApplicationController
+
+  before_action :must_login
+
   def index
     @users = User.all
   end
diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb
index 2020bee4..6084055c 100644
--- a/app/controllers/works_controller.rb
+++ b/app/controllers/works_controller.rb
@@ -50,7 +50,7 @@ def update
       flash.now[:status] = :failure
       flash.now[:result_text] = "Could not update #{@media_category.singularize}"
       flash.now[:messages] = @work.errors.messages
-      render :edit, status: :not_found
+      render :edit, status: :bad_request
     end
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 4cac8fe0..4fb7b6b2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,4 +3,19 @@ class User < ApplicationRecord
   has_many :ranked_works, through: :votes, source: :work
 
   validates :username, uniqueness: true, presence: true
+
+  def self.build_from_github(auth_hash)
+    user = User.new
+    user.uid = auth_hash[:uid]
+    user.provider = 'github'
+    user.name = auth_hash['info']['name']
+    user.email = auth_hash['info']['email']
+    user.username = auth_hash['info']['nickname']
+  #TODO: ADD PROVIDER TO DB
+
+
+    # Note that the user has not been saved
+    return user
+
+  end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e7b07ce4..037bf113 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -33,19 +33,19 @@
         </li>
       </ul>
       <ul class="nav app-header__user-nav-container">
-        <% if @login_user %>
+        <% if session[:user_id] %>
 
         <li class="nav-item app-header__nav_item">
           <%= link_to "Logged in as #{@login_user.username}", user_path(@login_user), class: "btn btn-primary" %>
         </li>
         <li class="nav-item app-header__nav_item">
-          <%= link_to "Log Out", logout_path, method: :post, class: "btn btn-primary" %>
+          <%= link_to "Log out", logout_path, class: "btn btn-primary", method: :delete %>
         </li>
 
         <% else %>
 
         <li class="nav-item app-header__nav_item">
-          <%= link_to "Log In", login_path, class: "btn btn-primary" %>
+          <%= link_to "Login with Github", "/auth/github", class: "btn btn-primary" %>
         </li>
         <% end %>
 
@@ -69,7 +69,6 @@
       </div>
     </section>
   <% end %>
-
   <main>
     <%= yield %>
   </main>
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 00000000..fd441612
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,3 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email"
+end
diff --git a/config/routes.rb b/config/routes.rb
index a7e8af1d..3ca6cd38 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,12 +1,24 @@
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+  get "/auth/:provider/callback", to: "sessions#create", as: 'auth_callback'
+  # get '/auth/github', as: 'github_login'
+  delete "/logout", to: "sessions#destroy", as: "logout"
+
+
   root 'works#root'
-  get '/login', to: 'sessions#login_form', as: 'login'
-  post '/login', to: 'sessions#login'
-  post '/logout', to: 'sessions#logout', as: 'logout'
+  # get '/login', to: 'sessions#login_form', as: 'login'
+  # post '/login', to: 'sessions#login'
+  # post '/logout', to: 'sessions#logout', as: 'logout'
 
   resources :works
   post '/works/:id/upvote', to: 'works#upvote', as: 'upvote'
 
   resources :users, only: [:index, :show]
+
+  #oath stuff
+  # TODO: add view helper?? need login path + add to view
+
+
+
+
 end
diff --git a/db/migrate/20181016180946_oath_stuff.rb b/db/migrate/20181016180946_oath_stuff.rb
new file mode 100644
index 00000000..0d106566
--- /dev/null
+++ b/db/migrate/20181016180946_oath_stuff.rb
@@ -0,0 +1,12 @@
+class OathStuff < ActiveRecord::Migration[5.2]
+  def change
+    change_table :users do |t|
+      t.string :name
+      t.string :email
+      t.integer :uid, null: false # this is the identifier provided by GitHub
+      t.string :provider, null: false # this tells us who provided the identifier
+
+      # t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20181029221142_remove_null_in_users.rb b/db/migrate/20181029221142_remove_null_in_users.rb
new file mode 100644
index 00000000..40ea5783
--- /dev/null
+++ b/db/migrate/20181029221142_remove_null_in_users.rb
@@ -0,0 +1,6 @@
+class RemoveNullInUsers < ActiveRecord::Migration[5.2]
+  def change
+    change_column_null :users, :uid, true
+    change_column_null :users, :provider, true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6bc8ba5c..51271a73 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,35 +10,39 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170407164321) do
+ActiveRecord::Schema.define(version: 2018_10_29_221142) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "users", force: :cascade do |t|
-    t.string   "username"
+  create_table "users", id: :serial, force: :cascade do |t|
+    t.string "username"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "name"
+    t.string "email"
+    t.integer "uid"
+    t.string "provider"
   end
 
-  create_table "votes", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "work_id"
+  create_table "votes", id: :serial, force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "work_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["user_id"], name: "index_votes_on_user_id", using: :btree
-    t.index ["work_id"], name: "index_votes_on_work_id", using: :btree
+    t.index ["user_id"], name: "index_votes_on_user_id"
+    t.index ["work_id"], name: "index_votes_on_work_id"
   end
 
-  create_table "works", force: :cascade do |t|
-    t.string   "title"
-    t.string   "creator"
-    t.string   "description"
-    t.string   "category"
-    t.datetime "created_at",                   null: false
-    t.datetime "updated_at",                   null: false
-    t.integer  "vote_count",       default: 0
-    t.integer  "publication_year"
+  create_table "works", id: :serial, force: :cascade do |t|
+    t.string "title"
+    t.string "creator"
+    t.string "description"
+    t.string "category"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "vote_count", default: 0
+    t.integer "publication_year"
   end
 
   add_foreign_key "votes", "users"
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index f641d15c..4d820c3a 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -1,5 +1,46 @@
 require "test_helper"
 
 describe SessionsController do
+  let(:kari) {users(:kari)}
+
+  describe 'auth_callback' do
+    it 'logs in an existing user and redirects to root' do
+      log_user_in(kari)
+
+      expect {
+        get auth_callback_path(:github)
+      }.wont_change 'User.count'
+
+      expect(session[:user_id]).must_equal kari.id
+      must_redirect_to root_path
+    end
+
+    it 'creates a new user and redirects to root' do
+
+      expect {
+        log_user_in(User.create(username: 'newy', email: 'new@new.com', uid: 1234, provider: 'github'))
+      }.must_change 'User.count', 1
+
+      must_redirect_to root_path
+    end
+
+    it 'does not allow user to login with bad data' do
+      expect{
+        log_user_in(User.create(username: nil, email: 'new@new.com', uid: 1234, provider: 'github'))
+      }.wont_change 'User.count'
+
+      expect(session[:user_id]).must_be_nil
+      must_redirect_to root_path
+    end
+  end
+
+  describe 'destroy' do
+    it 'ends session/logs out user' do
+      log_user_in(kari)
+
+      delete logout_path
+      expect(session[:user_id]).must_be_nil
+    end
+  end
 
 end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index d2c5cfbb..be391079 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -2,4 +2,53 @@
 
 describe UsersController do
 
+  describe 'logged-in users' do
+    let(:kari) {users(:kari)}
+
+    describe 'index' do
+      before do
+        log_user_in(kari)
+      end
+
+      it 'succeeds for user' do
+        get users_path
+        must_respond_with :success
+      end
+    end
+
+    describe 'show' do
+      before do
+        log_user_in(kari)
+      end
+
+      it 'succeeds for user with existing id' do
+        get user_path(users(:kari).id)
+        must_respond_with :success
+      end
+
+      it 'renders 404 for bogus work' do
+        get user_path(0)
+        must_respond_with 404
+      end
+    end
+  end
+
+  # oyyy can't get these to workkkkk
+
+  describe 'guests' do
+    it 'cannot access users index' do
+      get users_path
+
+      must_respond_with :redirect #bad_request
+      must_redirect_to root_path
+    end
+
+    it 'cannot access user show' do
+      get user_path(users(:kari).id)
+
+      must_respond_with :redirect #404
+      must_redirect_to root_path
+    end
+  end
+
 end
diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb
index 0945ca47..bc3336ec 100644
--- a/test/controllers/works_controller_test.rb
+++ b/test/controllers/works_controller_test.rb
@@ -1,116 +1,272 @@
 require 'test_helper'
+# TODO: PRECONDITIONS?
 
 describe WorksController do
-  describe "root" do
-    it "succeeds with all media types" do
-      # Precondition: there is at least one media of each category
+  CATEGORIES = %w(albums books movies)
+  INVALID_CATEGORIES = ["nope", "42", "", "  ", "albumstrailingtext"]
 
+  let(:kari) {users(:kari)}
+  let(:poodr) {works(:poodr)}
+  let(:new_work_params) {{
+    work: {
+      title: 'rubber soul',
+      creator: 'the beatles',
+      description: 'classic tunes',
+      category: 'album',
+      publication_year: 1965
+    }
+    }}
+
+
+    describe "root" do
+      it "succeeds with all media types" do
+        # Precondition: there is at least one media of each category
+        get root_path
+        must_respond_with :success
+      end
+
+      it "succeeds with one media type absent" do
+        # Precondition: there is at least one media in two of the categories
+        work = works(:movie)
+        work.delete
+
+        get root_path
+        must_respond_with :success
+      end
+
+      it "succeeds with no media" do
+        Work.all.each { |work| work.destroy}
+
+        Work.all.count.must_equal 0
+        get root_path
+        must_respond_with :success
+      end
     end
 
-    it "succeeds with one media type absent" do
-      # Precondition: there is at least one media in two of the categories
+    describe "index" do
+      it "succeeds when there are works" do
+        get works_path
+        must_respond_with :success
+      end
 
-    end
+      it "succeeds when there are no works" do
+        Work.all.each {|work| work.destroy}
 
-    it "succeeds with no media" do
+        Work.all.count.must_equal 0
+        get root_path
+        must_respond_with :success
+      end
+    end
 
+    describe "new" do
+      before do
+        log_user_in(kari)
+      end
+      it "succeeds" do
+        get new_work_path
+        must_respond_with :success
+      end
     end
-  end
 
-  CATEGORIES = %w(albums books movies)
-  INVALID_CATEGORIES = ["nope", "42", "", "  ", "albumstrailingtext"]
+    describe "create" do
+      # let(:log_in) {log_user_in(kari)}
 
-  describe "index" do
-    it "succeeds when there are works" do
+      it "creates a work with valid data for a real category" do
+        expect {
+          post works_path, params: new_work_params
+        }.must_change 'Work.count', 1
 
-    end
+        work = Work.find_by(title: 'rubber soul')
 
-    it "succeeds when there are no works" do
+        expect(flash[:status]).must_equal :success
 
-    end
-  end
+        must_respond_with :redirect
+        must_redirect_to work_path(work.id)
+      end
+      #
+      it "renders bad_request and does not update the DB for bogus data" do
+        new_work_params[:work][:title] = nil
 
-  describe "new" do
-    it "succeeds" do
+        expect {
+          post works_path, params: new_work_params
+        }.wont_change 'Work.count'
 
-    end
-  end
+        expect(flash[:status]).must_equal :failure
 
-  describe "create" do
-    it "creates a work with valid data for a real category" do
+        must_respond_with :bad_request
+      end
 
-    end
+      it "renders 400 bad_request for bogus categories" do
+        INVALID_CATEGORIES.each do |category|
+          new_work_params[:work][:category] = category
 
-    it "renders bad_request and does not update the DB for bogus data" do
+          expect {
+            post works_path, params: new_work_params
+          }.wont_change 'Work.count'
 
-    end
+          expect(flash[:status]).must_equal :failure
 
-    it "renders 400 bad_request for bogus categories" do
+          must_respond_with :bad_request
+        end
+      end
 
     end
 
-  end
+    describe "show" do
+      before do
+        log_user_in(kari)
+      end
 
-  describe "show" do
-    it "succeeds for an extant work ID" do
+      it "succeeds for an extant work ID" do
+        get work_path(poodr.id)
+        must_respond_with :success
+      end
 
+      it "renders 404 not_found for a bogus work ID" do
+        get work_path(0)
+        must_respond_with 404
+      end
     end
 
-    it "renders 404 not_found for a bogus work ID" do
+    describe "edit" do
+      before do
+        log_user_in(kari)
+      end
 
+      it "succeeds for an extant work ID" do
+        get edit_work_path(poodr.id)
+        must_respond_with :success
+      end
+
+      it "renders 404 not_found for a bogus work ID" do
+        get edit_work_path(0)
+        must_respond_with 404
+      end
     end
-  end
 
-  describe "edit" do
-    it "succeeds for an extant work ID" do
+    describe "update" do
+      before do
+        log_user_in(kari)
+      end
 
-    end
+      it "succeeds for valid data and an extant work ID" do
+        expect{
+          put work_path(poodr.id), params: new_work_params
+        }.wont_change 'Work.count'
 
-    it "renders 404 not_found for a bogus work ID" do
+        updated_work = Work.find_by(title: 'rubber soul')
 
-    end
-  end
+        expect(flash[:status]).must_equal :success
 
-  describe "update" do
-    it "succeeds for valid data and an extant work ID" do
+        must_respond_with :redirect
+        must_redirect_to work_path(updated_work.id)
 
-    end
+        expect(updated_work.title).must_equal new_work_params[:work][:title]
+      end
 
-    it "renders bad_request for bogus data" do
+      it "renders bad_request for bogus data" do
+        new_work_params[:work][:title] = nil
 
-    end
+        expect {
+          put work_path(poodr.id), params: new_work_params
+        }.wont_change 'Work.count'
+
+        must_respond_with :bad_request
+      end
 
-    it "renders 404 not_found for a bogus work ID" do
+      it "renders 404 not_found for a bogus work ID" do
+        expect {
+          put work_path(0), params: new_work_params
+        }.wont_change 'Work.count'
 
+        must_respond_with 404
+      end
     end
-  end
 
-  describe "destroy" do
-    it "succeeds for an extant work ID" do
+    describe "destroy" do
+      before do
+        log_user_in(kari)
+      end
 
-    end
+      it "succeeds for an extant work ID" do
+        expect {
+          delete work_path(poodr.id)
+        }.must_change 'Work.count', -1
 
-    it "renders 404 not_found and does not update the DB for a bogus work ID" do
+        must_respond_with :redirect
+        must_redirect_to root_path
 
+        expect(flash[:status]).must_equal :success
+      end
+
+      it "renders 404 not_found and does not update the DB for a bogus work ID" do
+        expect {
+          delete work_path(0)
+        }.wont_change 'Work.count'
+
+        must_respond_with 404
+      end
     end
-  end
 
-  describe "upvote" do
+    describe "upvote" do
+      before do
+        log_user_in(kari)
+      end
 
-    it "redirects to the work page if no user is logged in" do
+      it "redirects to the work page if no user is logged in" do
+        get work_path(poodr.id)
 
-    end
+        delete logout_path
+        expect(session[:user_id]).must_be_nil
 
-    it "redirects to the work page after the user has logged out" do
+        expect {
+          post upvote_path(poodr.id)
+        }.wont_change 'Vote.count'
 
-    end
+        must_respond_with :redirect
+        must_redirect_to work_path(poodr.id)
+      end
 
-    it "succeeds for a logged-in user and a fresh user-vote pair" do
+      it "redirects to the work page after the user has logged out" do
+        expect(session[:user_id]).must_equal kari.id
 
-    end
+        get work_path(poodr.id)
+
+        delete logout_path
+        expect(session[:user_id]).must_be_nil
+
+        expect {
+          post upvote_path(poodr.id)
+        }.wont_change 'Vote.count'
+
+        must_respond_with :redirect
+        must_redirect_to work_path(poodr.id)
+      end
+
+      it "succeeds for a logged-in user and a fresh user-vote pair" do
+        expect(session[:user_id]).must_equal kari.id
+
+        expect {
+          post upvote_path(poodr.id)
+        }.must_change 'Vote.count', 1
+
+        must_respond_with :redirect
+        must_redirect_to work_path(poodr.id)
+      end
+
+      it "redirects to the work page if the user has already voted for that work" do
+        expect(session[:user_id]).must_equal kari.id
+
+        expect {
+          post upvote_path(poodr.id)
+        }.must_change 'Vote.count', 1
 
-    it "redirects to the work page if the user has already voted for that work" do
+        expect {
+          post upvote_path(poodr.id)
+        }.wont_change 'Vote.count'
 
+        must_respond_with :redirect
+        must_redirect_to work_path(poodr.id)
+      end
     end
   end
-end
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index e2968d78..1010177c 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -2,6 +2,12 @@
 
 dan:
   username: dan
+  uid: 123
+  provider: github
+  email: dan@dan.com
 
 kari:
   username: kari
+  uid: 321
+  provider: github
+  email: kari@kari.com
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5b4fb667..b90a098f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -23,4 +23,25 @@ class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   fixtures :all
   # Add more helper methods to be used by all tests here...
+
+  def setup
+    OmniAuth.config.test_mode = true
+  end
+
+  def mock_auth_hash(user)
+    return {
+      provider: user.provider,
+      uid: user.uid,
+      info: {
+        email: user.email,
+        username: user.username
+      }
+    }
+  end
+
+  def log_user_in(user)
+    OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new(mock_auth_hash(user))
+
+    get auth_callback_path(:github)
+  end
 end