From 77b2cc0137be2520336726c81fdd58bcc26733a9 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Sat, 1 Sep 2012 07:10:59 -0500
Subject: [PATCH] * trying to fix routing issue cleanly

---
 app/views/layouts/_header.html.erb         |  4 ++--
 app/views/shared/_user_info.html.erb       |  2 +-
 config/routes.rb                           |  4 ++--
 spec/factories.rb                          |  2 +-
 spec/requests/authentication_pages_spec.rb | 27 +---------------------
 spec/requests/user_pages_spec.rb           |  2 +-
 spec/spec_helper.rb                        |  2 ++
 7 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 9897b939d..e39ac8199 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -8,14 +8,14 @@
           <li><%= link_to "Home", root_path %></li>
           <li><%= link_to "Help", help_path %></li>
           <% if signed_in? %>
-            <li><%= link_to "Users", jam_ruby_users_path %></li>
+            <li><%= link_to "Users", users_path %></li>
             <li id="fat-menu" class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                 Account <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
                 <li><%= link_to "Profile", current_user %></li>
-                <li><%= link_to "Settings", edit_jam_ruby_user_path(current_user) %></li>
+                <li><%= link_to "Settings", edit_user_path(current_user) %></li>
                 <li class="divider"></li>m
                 <li>
                   <%= link_to "Sign out", signout_path, method: "delete" %>
diff --git a/app/views/shared/_user_info.html.erb b/app/views/shared/_user_info.html.erb
index e9a20b70d..4d4d3c86e 100644
--- a/app/views/shared/_user_info.html.erb
+++ b/app/views/shared/_user_info.html.erb
@@ -1,4 +1,4 @@
-<a href="<%=jam_ruby_user_path(current_user) %>">
+<a href="<%=user_path(current_user) %>">
   <%= gravatar_for current_user, size: 52 %>
 </a>
 <h1>
diff --git a/config/routes.rb b/config/routes.rb
index fd8dcdfce..65ca70dca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,9 +1,9 @@
 SampleApp::Application.routes.draw do
   
-  scope as: 'jam_ruby' do
+  scope 'jam_ruby' do
     #resources :jam_session_members
     #resources :jam_sessions
-    resources :users
+    resources :users, :as => nil
   end
 
 
diff --git a/spec/factories.rb b/spec/factories.rb
index eafc46312..649e5259f 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :user do
+  factory :user, :class => "JamRuby::User" do
     sequence(:name)  { |n| "Person #{n}" }
     sequence(:email) { |n| "person_#{n}@example.com"}   
     password "foobar"
diff --git a/spec/requests/authentication_pages_spec.rb b/spec/requests/authentication_pages_spec.rb
index 21d1ec4d4..148e782e9 100644
--- a/spec/requests/authentication_pages_spec.rb
+++ b/spec/requests/authentication_pages_spec.rb
@@ -111,31 +111,6 @@ describe "Authentication" do
           it { should have_selector('title', text: 'Sign in') }
         end
       end
-
-      describe "in the Microposts controller" do
-
-        describe "submitting to the create action" do
-          before { post microposts_path }
-          specify { response.should redirect_to(signin_url) }
-        end
-
-        describe "submitting to the destroy action" do
-          before { delete micropost_path(FactoryGirl.create(:micropost)) }
-          specify { response.should redirect_to(signin_url) }
-        end
-      end
-
-      describe "in the Relationships controller" do
-        describe "submitting to the create action" do
-          before { post relationships_path }
-          specify { response.should redirect_to(signin_url) }
-        end
-
-        describe "submitting to the destroy action" do
-          before { delete relationship_path(1) }
-          specify { response.should redirect_to(signin_url) }          
-        end
-      end
     end
 
     describe "as wrong user" do
@@ -166,4 +141,4 @@ describe "Authentication" do
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/requests/user_pages_spec.rb b/spec/requests/user_pages_spec.rb
index 64ce7bf20..4bbf78452 100644
--- a/spec/requests/user_pages_spec.rb
+++ b/spec/requests/user_pages_spec.rb
@@ -45,7 +45,7 @@ describe "User pages" do
       end
 
       describe "showing the second page" do
-        before { visit users_path(page: 2) }
+        before { visit _users_path(page: 2) }
 
         it "should list the second page of users" do
           second_page.each do |user|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ce9db47b9..0232d68a7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,6 +7,8 @@ require 'active_record'
 require 'jam_db'
 require 'spec_db'
 
+include JamRuby
+
 # recreate test database and migrate it
 db_config = YAML::load(File.open('config/database.yml'))["test"]
 SpecDb::recreate_database(db_config)