Skip to content

Commit 272f9ec

Browse files
steveklabniksteveklabnik
committed
Merge remote branch 'lindseyb/master'
Conflicts: app/views/welcome/index.html.haml
2 parents 06b4b93 + a07b5ee commit 272f9ec

170 files changed

Lines changed: 379 additions & 10075 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bundle/config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
BUNDLE_WITHOUT: ""

‎Gemfile‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
source "http://rubygems.org"
2+
gem "sinatra"
3+
gem "haml"
4+
gem "rspec"
5+
gem "cucumber"
6+
gem "webrat"
7+
gem "mongo_mapper"
8+
gem "cucumber-sinatra"
9+
gem "capybara"
10+
gem "factory_girl"
11+
gem "bson_ext"
12+
gem "sinatra-authentication"
13+
gem "database_cleaner"
14+
gem "rack-flash"

‎README‎

Lines changed: 0 additions & 243 deletions
This file was deleted.

‎Rakefile‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
# Add your own tasks in files placed in lib/tasks ending in .rake,
2-
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
1+
require 'rubygems'
2+
require 'spec/rake/spectask'
3+
require 'cucumber/rake/task'
34

4-
require(File.join(File.dirname(__FILE__), 'config', 'boot'))
5+
Spec::Rake::SpecTask.new do |t|
6+
t.spec_files = FileList['spec/*_spec.rb',]
7+
t.spec_opts = ["--colour", "--backtrace"]
8+
end
59

6-
require 'rake'
7-
require 'rake/testtask'
8-
require 'rake/rdoctask'
9-
10-
require 'tasks/rails'
10+
Cucumber::Rake::Task.new(:features) do |t|
11+
t.cucumber_opts = "--format pretty"
12+
end

‎app/controllers/application_controller.rb‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎app/controllers/comments_controller.rb‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)