Add cucumber tag for long scenarios

Author: peakpg

Gemfile

@@ -17,7 +17,7 @@ group :production do
 end
 
 group :test do
- gem 'factory_girl_rails'
+ gem 'factory_girl_rails', '3.3.0'
  gem 'test-unit', '2.1.1'
  # :require=>false allows mocha to correctly modify the test:unit code to add mock() and stub()
  gem "mocha", '=0.9.8', :require=>false

Gemfile.lock

@@ -40,7 +40,7 @@ GEM
  activesupport (3.2.8)
  i18n (~> 0.6)
  multi_json (~> 1.0)
- addressable (2.2.8)
+ addressable (2.3.2)
  ancestry (1.2.5)
  activerecord (>= 2.2.2)
  arel (3.0.2)
@@ -50,43 +50,43 @@ GEM
  ffi (>= 1.0.11)
  rspec (>= 2.7.0)
  bluecloth (2.2.0)
- builder (3.0.0)
+ builder (3.0.4)
  capybara (1.1.2)
  mime-types (>= 1.16)
  nokogiri (>= 1.3.3)
  rack (>= 1.0.0)
  rack-test (>= 0.5.4)
  selenium-webdriver (~> 2.0)
  xpath (~> 0.1.4)
- childprocess (0.3.2)
- ffi (~> 1.0.6)
+ childprocess (0.3.6)
+ ffi (~> 1.0, >= 1.0.6)
  ckeditor_rails (3.6.4.1)
  railties (~> 3.0)
  thor (~> 0.14)
- cocaine (0.3.1)
- cucumber (1.2.0)
+ cocaine (0.4.2)
+ cucumber (1.2.1)
  builder (>= 2.1.2)
  diff-lcs (>= 1.1.3)
- gherkin (~> 2.10.0)
+ gherkin (~> 2.11.0)
  json (>= 1.4.6)
  cucumber-rails (1.3.0)
  capybara (>= 1.1.2)
  cucumber (>= 1.1.8)
  nokogiri (>= 1.5.0)
- daemons (1.1.8)
- database_cleaner (0.8.0)
+ daemons (1.1.9)
+ database_cleaner (0.9.1)
  diff-lcs (1.1.3)
  erubis (2.7.0)
- eventmachine (0.12.10)
+ eventmachine (1.0.0)
  execjs (1.4.0)
  multi_json (~> 1.0)
  factory_girl (3.3.0)
  activesupport (>= 3.0.0)
  factory_girl_rails (3.3.0)
  factory_girl (~> 3.3.0)
  railties (>= 3.0.0)
- ffi (1.0.11)
- gherkin (2.10.0)
+ ffi (1.1.5)
+ gherkin (2.11.5)
  json (>= 1.4.6)
  hike (1.2.1)
  i18n (0.6.1)
@@ -95,9 +95,9 @@ GEM
  railties (>= 3.1.0, < 5.0)
  thor (~> 0.14)
  json (1.7.5)
- launchy (2.1.0)
- addressable (~> 2.2.6)
- libwebsocket (0.1.3)
+ launchy (2.1.2)
+ addressable (~> 2.3)
+ libwebsocket (0.1.5)
  addressable
  mail (2.4.4)
  i18n (>= 0.4.0)
@@ -108,7 +108,7 @@ GEM
  rake
  multi_json (1.3.6)
  mysql2 (0.3.11)
- nokogiri (1.5.3)
+ nokogiri (1.5.5)
  paperclip (3.0.4)
  activemodel (>= 3.0.0)
  activerecord (>= 3.0.0)
@@ -121,7 +121,7 @@ GEM
  rack (>= 0.4)
  rack-ssl (1.3.2)
  rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
  rack (>= 1.0)
  rails (3.2.8)
  actionmailer (= 3.2.8)
@@ -141,24 +141,23 @@ GEM
  rake (0.9.2.2)
  rdoc (3.12)
  json (~> 1.4)
- rspec (2.10.0)
- rspec-core (~> 2.10.0)
- rspec-expectations (~> 2.10.0)
- rspec-mocks (~> 2.10.0)
- rspec-core (2.10.1)
- rspec-expectations (2.10.0)
+ rspec (2.11.0)
+ rspec-core (~> 2.11.0)
+ rspec-expectations (~> 2.11.0)
+ rspec-mocks (~> 2.11.0)
+ rspec-core (2.11.1)
+ rspec-expectations (2.11.3)
  diff-lcs (~> 1.1.3)
- rspec-mocks (2.10.1)
+ rspec-mocks (2.11.3)
  ruby-prof (0.11.2)
- rubyzip (0.9.8)
+ rubyzip (0.9.9)
  sass (3.2.1)
  sass-rails (3.2.5)
  railties (~> 3.2.0)
  sass (>= 3.1.10)
  tilt (~> 1.3)
- selenium-webdriver (2.22.2)
+ selenium-webdriver (2.25.0)
  childprocess (>= 0.2.5)
- ffi (~> 1.0)
  libwebsocket (~> 0.1.3)
  multi_json (~> 1.0)
  rubyzip
@@ -171,7 +170,7 @@ GEM
  sqlite3 (>= 1.3.3)
  term-ansicolor (1.0.7)
  test-unit (2.1.1)
- thin (1.3.1)
+ thin (1.5.0)
  daemons (>= 1.0.9)
  eventmachine (>= 0.12.6)
  rack (>= 1.0.0)
@@ -181,12 +180,12 @@ GEM
  polyglot
  polyglot (>= 0.3.1)
  tzinfo (0.3.33)
- uglifier (1.2.4)
+ uglifier (1.3.0)
  execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
+ multi_json (~> 1.0, >= 1.0.2)
  xpath (0.1.4)
  nokogiri (~> 1.3)
- yard (0.8.2)
+ yard (0.8.3)
 
 PLATFORMS
  ruby
@@ -199,7 +198,7 @@ DEPENDENCIES
  cucumber
  cucumber-rails
  database_cleaner
- factory_girl_rails
+ factory_girl_rails (= 3.3.0)
  launchy
  mocha (= 0.9.8)
  mysql2

doc/release_notes.md

@@ -1,3 +1,9 @@
+v3.5.5
+======
+
+* Update to Rails 3.2.8 - Ensure tests to pass (there appeared to be some changes in inflection and html_safe between 3.2.5 and 3.2.8)
+
+
 v3.5.4
 ======
 

features/commands/upgrade_project_to_3_4_0_from_3_3_x.feature

@@ -6,6 +6,7 @@ Feature:
  Background:
  Given I am working on a BrowserCMS v3.3.x project named "petstore"
 
+ @long-scenario
  Scenario: Upgrade Project
  When I run the bcms update script with bundler
  Then Gemfile should have the correct version of BrowserCMS

features/support/long_scenarios.rb

@@ -0,0 +1,4 @@
+# Some CLI scenarios run bundler, which can take a while.
+Before('@long-scenario') do
+ @aruba_timeout_seconds = 60
+end