diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index b2bad6ce9..bbbcf7625 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -12,10 +12,10 @@ %body #container - - if user_signed_in? - = link_to "log out", destroy_user_session_path - - else - = link_to "login", new_user_session_path + / - if user_signed_in? + / = link_to "log out", destroy_user_session_path + / - else + / = link_to "login", new_user_session_path - flash.each do |name, msg| = content_tag :div, msg, :id => "flash_#{name}" diff --git a/config/environments/test.rb b/config/environments/test.rb index 40d222032..fab2538d4 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -5,7 +5,7 @@ Diaspora::Application.configure do # test suite. You never need to work with it otherwise. Remember that # your test database is "scratch space" for the test suite and is wiped # and recreated between test runs. Don't rely on the data there! - config.cache_classes = true + config.cache_classes = false # Log error messages when you accidentally call methods on nil. config.whiny_nils = true diff --git a/config/routes.rb b/config/routes.rb index d6e3f799e..80c679be6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Diaspora::Application.routes.draw do |map| + resources :status_messages + #routes for devise, not really sure you will need to mess with this in the future, lets put default, #non mutable stuff in anohter file devise_for :users, :path_names => {:sign_up => "signup", :sign_in => "login", :sign_out => "logout"} diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 03690c972..1718c345a 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -1,10 +1,14 @@ require File.dirname(__FILE__) + '/../spec_helper' describe UsersController do - render_views - + #render_views #fixtures here? + it 'should, after logging in redirect to the dashboard page' do - puts "where is rafi" + pending + #go to /login + #fill in the form + #stub create action + #should get a redirect end end diff --git a/spec/models/misc_spec.rb b/spec/models/misc_spec.rb deleted file mode 100644 index abbf71e45..000000000 --- a/spec/models/misc_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -require File.dirname(__FILE__) + '/../spec_helper' - -describe 'making sure the spec runner works' do - - it 'should not delete the database mid-spec' do - User.count.should == 0 - billy = User.create(:email => "billy@aol.com", :password => "foobar") - User.count.should == 1 - end - - it 'should make sure the last user no longer exsists' do - User.count.should == 0 - end - - describe 'testing a before do block' do - before do - @bill = User.create(:email => "billy@aol.com", :password => "foobar") - - end - - it 'should have cleaned before the before do block runs' do - User.count.should == 1 - end - - end - -end \ No newline at end of file diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 0f545327b..a77433c27 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1,4 +1,5 @@ require 'spec_helper' +#this is implementation is done by devise describe User do end