Permalink
Browse files

Merge with master

  • Loading branch information...
2 parents b1698f1 + 037d6f6 commit bd51fc54af8609d4f5ab4fb93160d2f7232f0bd6 @aslakhellesoy aslakhellesoy committed Oct 3, 2011
Showing with 67 additions and 11 deletions.
  1. +15 −9 Gemfile.lock
  2. +1 −1 History.md
  3. +2 −1 cucumber-rails.gemspec
  4. +47 −0 spec/generators/cucumber/install/install_generator_spec.rb
  5. +2 −0 spec/spec_helper.rb
View
@@ -38,6 +38,11 @@ GEM
activesupport (= 3.1.0)
activesupport (3.1.0)
multi_json (~> 1.0)
+ ammeter (0.1.2)
+ activesupport (~> 3)
+ railties (~> 3)
+ rspec (~> 2)
+ rspec-rails (~> 2)
ansi (1.3.0)
arel (2.2.1)
aruba (0.4.6)
@@ -93,16 +98,16 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- mongo (1.3.1)
- bson (>= 1.3.1)
- mongoid (2.2.1)
+ mongo (1.4.0)
+ bson (= 1.4.0)
+ mongoid (2.2.2)
activemodel (~> 3.0)
- mongo (>= 1.3, < 1.4)
+ mongo (~> 1.3)
tzinfo (~> 0.3.22)
multi_json (1.0.3)
nokogiri (1.5.0)
polyglot (0.3.2)
- rack (1.3.3)
+ rack (1.3.4)
rack-cache (1.0.3)
rack (>= 0.4)
rack-mount (0.8.3)
@@ -143,13 +148,13 @@ GEM
railties (~> 3.0)
rspec (~> 2.6.0)
rubyzip (0.9.4)
- sass (3.1.7)
+ sass (3.1.8)
selenium-webdriver (2.7.0)
childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
- sprockets (2.0.0)
+ sprockets (2.0.1)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -162,7 +167,7 @@ GEM
polyglot (>= 0.3.1)
turn (0.8.2)
ansi (>= 1.2.2)
- tzinfo (0.3.29)
+ tzinfo (0.3.30)
uglifier (1.0.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -174,6 +179,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ ammeter (>= 0.1.2)
aruba (>= 0.4.6)
bcat (~> 0.6.2)
bson_ext (>= 1.3.1)
@@ -183,7 +189,7 @@ DEPENDENCIES
database_cleaner (>= 0.6.7)
factory_girl (>= 2.1.0)
jquery-rails (>= 1.0.14)
- mongoid (>= 2.2.0)
+ mongoid (>= 2.2.2)
rails (>= 3.1.0)
rake (>= 0.9.2)
rdiscount (~> 1.6.8)
View
@@ -1,4 +1,4 @@
-## [v1.1.0](https://github.com/cucumber/cucumber-rails/compare/v1.1.0...v1.1.1)
+## [v1.1.1](https://github.com/cucumber/cucumber-rails/compare/v1.1.0...v1.1.1)
### Removed features
View
@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
s.add_development_dependency('sqlite3', '>= 1.3.4')
s.add_development_dependency('rspec', '>= 2.6.0')
s.add_development_dependency('rspec-rails', '>= 2.6.1')
+ s.add_development_dependency('ammeter', '>= 0.1.2')
s.add_development_dependency('factory_girl', '>= 2.1.0')
s.add_development_dependency('database_cleaner', '>= 0.6.7')
- s.add_development_dependency('mongoid', '>= 2.2.0')
+ s.add_development_dependency('mongoid', '>= 2.2.2')
s.add_development_dependency('bson_ext', '>= 1.3.1')
# Various Stuff that Rails 3.1 puts inside apps.
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/cucumber/install/install_generator'
+
+describe Cucumber::InstallGenerator do
+ # Tell the generator where to put its output (what it thinks of as Rails.root)
+ destination File.expand_path("../../../../../tmp", __FILE__)
+
+ before { prepare_destination }
+
+ describe 'no arguments' do
+ before { run_generator }
+
+ describe 'config/cucumber.yml' do
+ subject { file('config/cucumber.yml') }
+ it { should exist }
+ it { should contain "default: <%= std_opts %> features" }
+ end
+
+ describe 'features/step_definitions folder' do
+ subject { file('features/step_definitions') }
+ it { should exist }
+ end
+
+ describe 'features/support/env.rb' do
+ subject { file('features/support/env.rb') }
+ it { should exist }
+ it { should contain "# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril." }
+ it { should contain "require 'cucumber/rails'" }
+ end
+
+ describe 'lib/tasks/cucumber.rake' do
+ subject { file('lib/tasks/cucumber.rake') }
+ it { should exist }
+ it { should contain "# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril." }
+ it { should contain "task :cucumber => 'cucumber:ok'" }
+ end
+
+ describe 'script/cucumber' do
+ subject { file('script/cucumber') }
+ it { should exist }
+ it { should contain "load Cucumber::BINARY" }
+ end
+
+ end
+end
View
@@ -1,3 +1,5 @@
require 'rubygems'
gem 'rspec'
require 'rspec/autorun'
+
+require 'ammeter/init'

0 comments on commit bd51fc5

Please sign in to comment.