refactored layout and added questions features for creating questions attached to user

dominic · dominic · commit 86a79c87b131 · 2011-09-03T15:33:32.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -41,4 +41,5 @@ end
 
 group :test do
   gem "mocha"
+  gem "database_cleaner"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -68,6 +68,7 @@ GEM
       capybara (>= 1.0.0)
       cucumber (~> 1.0.0)
       nokogiri (>= 1.4.6)
+    database_cleaner (0.6.7)
     devise (1.4.2)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
@@ -210,6 +211,7 @@ DEPENDENCIES
   cancan
   coffee-rails (~> 3.1.0.rc)
   cucumber-rails
+  database_cleaner
   devise (>= 1.2)
   fabrication
   faker
diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
@@ -1,10 +1,9 @@
 class QuestionsController < InheritedController
-
-  def index
-    @question = Question.new
-  end
+  load_and_authorize_resource
 
   def create
-    create!(:notice => "Question Asked!"){collection_url}
+    @question = Question.create params[:question]
+    @question.user = current_user
+    create!(:notice => "Question Asked!"){ collection_url }
   end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -1,7 +1,15 @@
 class Ability
   include CanCan::Ability
 
-  def initialize(user)
+  def initialize(user)  
+    
+    can :read, Question
+    
+    if user
+      can :create, Question
+      can :manage, Question, :user => user
+    end  
+    
     # Define abilities for the passed in user here. For example:
     #
     #   user ||= User.new # guest user (not logged in)
diff --git a/app/models/question.rb b/app/models/question.rb
@@ -4,4 +4,6 @@ class Question
   key :title, String
   key :description, String
 
+  belongs_to :user
+
 end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -13,5 +13,8 @@
     - if flash[:notice]
       .flash #{flash[:notice]}
 
+    %h1.title
+      = yield :title
+
     = yield :links
     = yield
diff --git a/app/views/questions/edit.html.haml b/app/views/questions/edit.html.haml
@@ -1,4 +1,4 @@
 - content_for :title do
-  = "Editing #{resource}"
+  = "Editing #{resource.title}"
 
 = render 'form'
diff --git a/app/views/questions/index.html.haml b/app/views/questions/index.html.haml
@@ -3,7 +3,7 @@
   
 - content_for :links do
   - if can? :create, Question
-    = link_to "New question", new_resource_path
+    = link_to "Ask a Question", new_resource_path
   
 %table
   %thead
diff --git a/app/views/questions/show.html.haml b/app/views/questions/show.html.haml
@@ -1,14 +1,14 @@
 - content_for :title do
-  = resource
+  = resource.title
 
 - content_for :links do
   - if can? :update, resource
     = link_to 'Edit', edit_resource_path
   - if can? :destroy, resource
     = link_to 'Delete', resource_path, :confirm => 'Are you sure?', :method => :delete
 
-%dl
-  %dt Title
-  %dd= resource.title
-  %dt Description
-  %dd= resource.description
+- if resource.user
+  .author Created by #{resource.user.username} 
+
+.description
+  = resource.description
diff --git a/app/views/shared/menu/_user.html.haml b/app/views/shared/menu/_user.html.haml
@@ -1,6 +1,6 @@
 = semantic_menu do |root|
   - if current_user
-    = current_user.email
-    - root.add "Log Out", destroy_user_session_path, :method => :delete
+    = current_user.username
+    - root.add "Log Out", logout_path
   - else
-    - root.add "Log In", new_user_session_path 
+    - root.add "Log In", login_path
diff --git a/config/routes.rb b/config/routes.rb
@@ -11,7 +11,10 @@
     end
   end
 
-  devise_for :users
+  devise_for :users do
+    get "login" => "devise/sessions#new", :as => "login"
+    get "logout" => "devise/sessions#destroy", :as => "logout"
+  end
 
   root :to => "static#root"
 
diff --git a/features/questions.feature b/features/questions.feature
@@ -0,0 +1,22 @@
+Feature: CRUD actions for question
+
+  As a user of the site, I can perform standard CRUD actions on questions
+  
+  Background: I am logged into the site
+    Given I am a user with username "test" and password "password"
+    And I sign in as "test/password"
+    And I am on the questions index
+  
+  Scenario: Create a question
+    When I follow "Ask a Question"
+    And I fill in the following:
+      | Title | My Question |
+      | Description | My Description |
+    And I press "Ask Everyone"
+    Then I should see "Question Asked!"
+    When I follow "Show" within "table"
+    Then I should see "My Question" within ".title"
+    And I should see "Created by test"
+    
+  Scenario: Edit an existing question
+    Given I have created a question
diff --git a/features/step_definitions/question_steps.rb b/features/step_definitions/question_steps.rb
@@ -0,0 +1,3 @@
+Given /^I have created a question$/ do
+  pending
+end
diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
@@ -0,0 +1,60 @@
+Given /^no user exists with an email of "(.*)"$/ do |email|
+  User.find(:first, :conditions => { :email => email }).should be_nil
+end
+
+Given /^I am a user with username "([^"]*)" and password "([^"]*)"$/ do |username, password|
+  User.new(:username => username,
+            :email => "#{username}@example.com",
+            :password => password,
+            :password_confirmation => password).save!
+end
+
+Then /^I should be already signed in$/ do
+  And %{I should see "Logout"}
+end
+
+Given /^I am signed up as "(.*)\/(.*)"$/ do |username, password|
+  Given %{I am not logged in}
+  When %{I go to the sign up page}
+  And %{I fill in "Username" with "#{username}"}
+  And %{I fill in "Email" with "#{username}@example.com"}
+  And %{I fill in "Password" with "#{password}"}
+  And %{I fill in "Password confirmation" with "#{password}"}
+  And %{I press "Sign up"}
+  Then %{I should see "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."}
+  And %{I am logout}
+end
+
+Then /^I sign out$/ do
+  visit(logout_path)
+end
+
+Given /^I am logout$/ do
+  Given %{I sign out}
+end
+
+Given /^I am not logged in$/ do
+  Given %{I sign out}
+end
+
+When /^I sign in as "(.*)\/(.*)"$/ do |username, password|
+  Given %{I am not logged in}
+  When %{I go to the sign in page}
+  And %{I fill in "Username" with "#{username}"}
+  And %{I fill in "Password" with "#{password}"}
+  And %{I press "Sign in"}
+end
+
+Then /^I should be signed in$/ do
+  Then %{I should see "Signed in successfully."}
+end
+
+When /^I return next time$/ do
+  And %{I go to the home page}
+end
+
+Then /^I should be signed out$/ do
+  And %{I should see "Sign up"}
+  And %{I should see "Login"}
+  And %{I should not see "Logout"}
+end
diff --git a/features/support/env.rb b/features/support/env.rb
@@ -31,10 +31,14 @@
 
 # Remove/comment out the lines below if your app doesn't have a database.
 # For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
-begin
-  DatabaseCleaner.strategy = :transaction
-rescue NameError
-  raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
+DatabaseCleaner.strategy = :truncation
+
+Before do
+  MongoMapper.database.collections.each do |collection|
+    unless collection.name.match(/^system\./)
+      collection.remove
+    end
+  end
 end
 
 # You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
diff --git a/features/support/paths.rb b/features/support/paths.rb
@@ -11,6 +11,13 @@ def path_to(page_name)
     when /^the home\s?page$/
       '/'
 
+    when /^the sign in page$/
+      login_path
+      
+    when /^the questions index$/
+      questions_path
+
+
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:
     #
diff --git a/spec/fabricators/question_fabricator.rb b/spec/fabricators/question_fabricator.rb
@@ -1,4 +1,5 @@
 Fabricator(:question) do
-  title "MyString"
-  description "MyString"
+  title "Title"
+  description "Description"
+  user
 end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
@@ -1,2 +1,5 @@
 Fabricator(:user) do
+  email { sequence(:email) { |i| "user#{i}@example.com"} }
+  password "password"
+  password_confirmation "password"
 end
diff --git a/spec/requests/api/api_programs_spec.rb b/spec/requests/api/api_programs_spec.rb
diff --git a/spec/requests/questions_spec.rb b/spec/requests/questions_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -17,11 +17,17 @@
   # config.mock_with :rr
   config.mock_with :rspec
 
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  # config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
   # config.use_transactional_fixtures = true
+
+  config.after(:each) do
+    MongoMapper.database.collections.each do |collection|
+      unless collection.name.match(/^system\./)
+        collection.remove
+      end
+    end
+  end
 end
+
diff --git a/spec/views/questions/index.html.haml_spec.rb b/spec/views/questions/index.html.haml_spec.rb
@@ -2,16 +2,11 @@
 
 describe "questions/index.html.haml" do
   before(:each) do
-    assign(:questions, [
-      stub_model(Question,
-        :title => "Title",
-        :description => "Description"
-      ),
-      stub_model(Question,
-        :title => "Title",
-        :description => "Description"
-      )
-    ])
+    questions = []
+    2.times do
+      questions = Fabricate(:question)
+    end
+    assign("collection", questions)
   end
 
   it "renders a list of questions" do
diff --git a/spec/views/root.html.haml_spec.rb b/spec/views/root.html.haml_spec.rb
@@ -2,9 +2,9 @@
 
 describe "static/root" do
   
-  it "links to questions" do
+  it "has homepage content" do
     render
-    rendered.should have_selector('a', :href => '/questions')
+    rendered.should have_selector('h1', :content => "Home!")
   end
   
 end
