Commit 5144cbc

@@ -16,9 +16,9 @@ class ApplicationController < ActionController::Base
 
   def ensure_valid_session
     unless session[:user_session_id] && @current_session = Session.find(session[:user_session_id])
-      redirect_to new_login_path
+      redirect_to new_session_path
     end
   rescue ActiveRecord::RecordNotFound
-    redirect_to new_login_path
+    redirect_to new_session_path
   end
 end

@@ -1,4 +1,4 @@
-class LoginsController < ApplicationController
+class SessionsController < ApplicationController
   before_filter :load_dependencies
   skip_before_filter :ensure_valid_session, only: [:new, :create]
   layout 'public'

@@ -2,7 +2,7 @@
   <div class="col-md-4">
   </div>
   <div class="col-md-4">
-    <%= form_tag logins_path, method: :post, class: 'form-signin', role: 'form' do %>
+    <%= form_tag sessions_path, method: :post, class: 'form-signin', role: 'form' do %>
       <h2 class="form-signin-heading">Please sign in</h2>
       <%= text_field_tag :email, nil, class: 'form-control', placeholder: "Email address", required: :required, autofocus: :autofocus %>
       <%= password_field_tag :password, nil, class: 'form-control', placeholder: "Password", required: :required %>

@@ -1,5 +1,5 @@
 Mocode::Application.routes.draw do
-  resources :logins, only: [:new, :create]
+  resources :sessions, only: [:new, :create]
   resources :videos, only: [:index]
   get 'dashboard', to: 'dashboard#index'
   root 'dashboard#index'

@@ -26,14 +26,14 @@ describe ApplicationController do
   context "when not signed in" do
     it "boots you out when their is no session_id" do
       get :index
-      response.should redirect_to(new_login_path)
+      response.should redirect_to(new_session_path)
     end
 
     it "boots you out when the session id is not known" do
       Session.stub(:find).with(100).and_raise(ActiveRecord::RecordNotFound)
 
       get :index, {}, user_session_id: 100
-      response.should redirect_to(new_login_path)
+      response.should redirect_to(new_session_path)
     end
   end
 end

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe LoginsController do
+describe SessionsController do
   describe "#new" do
     it "loads the login page" do
       get :new

@@ -1,11 +1,11 @@
 require "spec_helper"
 
-describe '/logins' do
-  it "routes to logins#new" do
-    expect(get: 'logins/new').to route_to(controller: 'logins', action: 'new')
+describe '/sessions' do
+  it "routes to sessions#new" do
+    expect(get: 'sessions/new').to route_to(controller: 'sessions', action: 'new')
   end
 
-  it "routes to logins#create" do
-    expect(post: 'logins').to route_to(controller: 'logins', action: 'create')
+  it "routes to sessions#create" do
+    expect(post: 'sessions').to route_to(controller: 'sessions', action: 'create')
   end
 end

@@ -2,6 +2,6 @@ require "spec_helper"
 
 describe '/' do
   it "should route to the login page" do
-    expect(get: '/').to route_to(controller: 'logins', action: 'new')
+    expect(get: '/').to route_to(controller: 'dashboard', action: 'index')
   end
 end