Skip to content
Browse files

Get features running (but still failing)

  • Loading branch information...
1 parent 9082f6f commit a73bbc20cc55ce3f436f6744b6564aa6033883e0 @xaviershay xaviershay committed
Showing with 5 additions and 9 deletions.
  1. +1 −2 Gemfile
  2. +3 −1 Gemfile.lock
  3. +1 −1 app/models/post.rb
  4. +0 −5 features/steps/env.rb
View
3 Gemfile
@@ -5,7 +5,6 @@ gem 'rails', '3.0.1'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-# gem 'mysql2'
gem 'sqlite3-ruby', :require => 'sqlite3'
# Use unicorn as the web server
@@ -31,7 +30,7 @@ gem 'will_paginate', '~> 3.0.pre3'
# put test-only gems in this group so their generators
# and rake tasks are available in development mode:
group :development, :test do
- gem 'cucumber'
+ gem 'cucumber-rails'
gem 'webrat'
gem 'factory_girl'
gem 'rspec'
View
4 Gemfile.lock
@@ -40,6 +40,8 @@ GEM
gherkin (~> 2.2.9)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
+ cucumber-rails (0.3.2)
+ cucumber (>= 0.8.0)
diff-lcs (1.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
@@ -115,7 +117,7 @@ DEPENDENCIES
RedCloth
chronic
coderay
- cucumber
+ cucumber-rails
factory_girl
formtastic
lesstile
View
2 app/models/post.rb
@@ -33,7 +33,7 @@ def published?
attr_accessor :published_at_natural
def published_at_natural
- @published_at_natural ||= published_at.send_with_default(:strftime, 'now', "%Y-%m-%d %H:%M")
+ @published_at_natural ||= published_at.send_with_default(:strftime, 'now', "%Y-%m-%d")
end
class << self
View
5 features/steps/env.rb
@@ -10,11 +10,6 @@
# Comment out the next line if you're not using RSpec's matchers (should / should_not) in your steps.
require 'cucumber/rails/rspec'
-require File.expand_path(File.dirname(__FILE__) + '/factories')
-
-#require 'rr'
-#Cucumber::Rails::World.send(:include, RR::Adapters::RRMethods)
-
# Fix for Webrat for Rails 2.3 until Webrat gets patched
# http://webrat.lighthouseapp.com/projects/10503/tickets/161-urlencodedpairparser-removed-in-edge-rails
module Webrat

0 comments on commit a73bbc2

Please sign in to comment.
Something went wrong with that request. Please try again.