Permalink
Browse files

Features passing and specs really passing.

Added bundler require line in application.rb

Upgrade/switched some gems in Gemfile to be rails3 compatible
  • Loading branch information...
1 parent f5e3a8d commit 417853907b3e49841016402008d87420fdd1d764 @jschoolcraft committed Jul 26, 2010
Showing with 1,290 additions and 336 deletions.
  1. +16 −10 Gemfile
  2. +65 −51 Gemfile.lock
  3. +1 −1 app/helpers/layout_helper.rb
  4. +1 −1 app/helpers/tags_helper.rb
  5. +1 −1 app/views/accounts/edit.html.erb
  6. +1 −1 app/views/accounts/new.html.erb
  7. +1 −1 app/views/admin/super_user_sessions/new.html.erb
  8. +1 −1 app/views/layouts/application.html.erb
  9. +1 −1 app/views/password_resets/edit.html.erb
  10. +2 −2 app/views/password_resets/new.html.erb
  11. +1 −1 app/views/tags/_link.html.erb
  12. +1 −1 app/views/tags/_tag.html.erb
  13. +1 −1 app/views/tags/index.html.erb
  14. +1 −1 app/views/tags/not_tracking.html.erb
  15. +3 −3 app/views/tags/show.html.erb
  16. +1 −1 app/views/user_sessions/new.html.erb
  17. +117 −0 capybara-20100726104254.html
  18. +117 −0 capybara-20100726104611.html
  19. +1 −3 config/application.rb
  20. +1 −1 config/cucumber.yml
  21. +19 −24 config/environments/cucumber.rb
  22. +1 −0 features/admin_dashboard.feature
  23. +4 −4 features/password_reset.feature
  24. +1 −0 features/popular_links.feature
  25. +1 −1 features/read_links.feature
  26. +1 −1 features/step_definitions/email_steps.rb
  27. +6 −7 features/step_definitions/popular_link_steps.rb
  28. +4 −6 features/step_definitions/track_tag_steps.rb
  29. +6 −8 features/step_definitions/user_steps.rb
  30. +107 −169 features/step_definitions/web_steps.rb
  31. +1 −0 features/superuser_authentication.feature
  32. +10 −9 features/support/env.rb
  33. +6 −0 features/support/urlagg_env.rb
  34. +4 −5 features/track_tags.feature
  35. +6 −6 features/user_profile.feature
  36. +2 −2 spec/controllers/tags_controller_spec.rb
  37. +0 −12 spec/helpers/layout_helper_spec.rb
  38. +20 −0 vendor/plugins/dynamic_form/MIT-LICENSE
  39. +13 −0 vendor/plugins/dynamic_form/README
  40. +10 −0 vendor/plugins/dynamic_form/Rakefile
  41. +5 −0 vendor/plugins/dynamic_form/init.rb
  42. +300 −0 vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb
  43. +8 −0 vendor/plugins/dynamic_form/lib/action_view/locale/en.yml
  44. +42 −0 vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb
  45. +370 −0 vendor/plugins/dynamic_form/test/dynamic_form_test.rb
  46. +9 −0 vendor/plugins/dynamic_form/test/test_helper.rb
View
@@ -2,24 +2,30 @@ source "http://rubygems.org"
gem "rails", "3.0.0.beta4"
gem "mysql"
-gem "authlogic"
+gem "authlogic", :git => "git://github.com/odorcicd/authlogic.git", :branch => 'rails3'
gem "json"
gem "ratom", :require => 'atom'
-gem "will_paginate"
+gem "will_paginate", :git => "git://github.com/mislav/will_paginate.git", :branch => "rails3"
gem "haml"
-gem "newrelic_rpm"
-gem "big_sitemap", :git => 'http://github.com/alexrabarts/big_sitemap.git'
+gem "newrelic_rpm", "2.13.0.beta5"
+# gem "big_sitemap", :git => 'http://github.com/alexrabarts/big_sitemap.git'
gem "slim_scrooge"
-group :test do
+group :cucumber, :test do
gem "rspec", "2.0.0.beta.14"
gem "rspec-rails", "2.0.0.beta.14.1"
- gem "remarkable_activerecord", "4.0.0.alpha4"
- gem "cucumber", "0.8.3"
- gem "cucumber-rails", "0.3.2"
gem "database_cleaner", "0.5.2"
- gem "launchy"
gem 'email_spec', :git => "git://github.com/bmabey/email-spec.git", :branch => "rails3"
- gem 'webrat', "0.7.1"
gem "factory_girl", :require => false
end
+
+group :cucumber do
+ gem "cucumber", "0.8.3"
+ gem "cucumber-rails", "0.3.2"
+ gem "launchy"
+ gem "capybara", "0.3.9"
+end
+
+group :test do
+ gem "remarkable_activerecord", "4.0.0.alpha4"
+end
View
@@ -1,26 +1,18 @@
---
dependencies:
- big_sitemap:
- group:
- - :default
- version: ">= 0"
rails:
group:
- :default
version: = 3.0.0.beta4
- mysql:
+ haml:
group:
- :default
version: ">= 0"
authlogic:
group:
- :default
version: ">= 0"
- haml:
- group:
- - :default
- version: ">= 0"
- newrelic_rpm:
+ mysql:
group:
- :default
version: ">= 0"
@@ -30,60 +22,69 @@ dependencies:
version: ">= 0"
require:
- atom
+ newrelic_rpm:
+ group:
+ - :default
+ version: = 2.13.0.beta5
rspec:
group:
+ - :cucumber
- :test
version: = 2.0.0.beta.14
- database_cleaner:
- group:
- - :test
- version: = 0.5.2
rspec-rails:
group:
+ - :cucumber
- :test
version: = 2.0.0.beta.14.1
- factory_girl:
+ database_cleaner:
group:
+ - :cucumber
- :test
- version: ">= 0"
- require: []
-
- will_paginate:
+ version: = 0.5.2
+ remarkable_activerecord:
+ group:
+ - :test
+ version: = 4.0.0.alpha4
+ json:
group:
- :default
version: ">= 0"
- json:
+ will_paginate:
group:
- :default
version: ">= 0"
- remarkable_activerecord:
+ factory_girl:
group:
+ - :cucumber
- :test
- version: = 4.0.0.alpha4
+ version: ">= 0"
+ require: []
+
cucumber-rails:
group:
- - :test
+ - :cucumber
version: = 0.3.2
- webrat:
+ cucumber:
group:
- - :test
- version: = 0.7.1
+ - :cucumber
+ version: = 0.8.3
email_spec:
group:
+ - :cucumber
- :test
version: ">= 0"
- cucumber:
+ launchy:
group:
- - :test
- version: = 0.8.3
+ - :cucumber
+ version: ">= 0"
slim_scrooge:
group:
- :default
version: ">= 0"
- launchy:
+ capybara:
group:
- - :test
- version: ">= 0"
+ - :cucumber
+ version: = 0.3.9
specs:
- rake:
version: 0.8.7
@@ -102,7 +103,7 @@ specs:
- rack:
version: 1.1.0
- rack-mount:
- version: 0.6.6
+ version: 0.6.9
- rack-test:
version: 0.5.4
- tzinfo:
@@ -126,14 +127,24 @@ specs:
- activeresource:
version: 3.0.0.beta4
- authlogic:
- version: 2.1.5
-- extlib:
- version: 0.9.15
-- big_sitemap:
- version: 0.5.1
- source: 1
+ version: 2.1.3
+ source: 2
- bundler:
version: 0.9.26
+- culerity:
+ version: 0.2.10
+- nokogiri:
+ version: 1.4.2
+- ffi:
+ version: 0.6.3
+- json_pure:
+ version: 1.4.3
+- rubyzip:
+ version: 0.9.4
+- selenium-webdriver:
+ version: 0.0.27
+- capybara:
+ version: 0.3.9
- configuration:
version: 1.1.0
- diff-lcs:
@@ -142,8 +153,6 @@ specs:
version: 1.16.2
- gherkin:
version: 2.0.2
-- json_pure:
- version: 1.4.3
- term-ansicolor:
version: 1.0.5
- cucumber:
@@ -162,17 +171,15 @@ specs:
- json:
version: 1.4.3
- launchy:
- version: 0.3.5
+ version: 0.3.7
- libxml-ruby:
version: 1.1.4
- mysql:
version: 2.8.1
- newrelic_rpm:
- version: 2.12.3
-- nokogiri:
- version: 1.4.2
+ version: 2.13.0.beta5
- thor:
- version: 0.13.7
+ version: 0.13.8
- railties:
version: 3.0.0.beta4
- rails:
@@ -200,17 +207,24 @@ specs:
- slim_scrooge:
version: 1.0.10
- will_paginate:
- version: 2.3.14
-hash: 17c9bca8c6c2f65bf8b5971c661e5080830e2e09
+ version: 3.0.pre
+ source: 1
+hash: e918ed12cada1a7be4bd905d830024db80ea0e00
sources:
- Git:
uri: git://github.com/bmabey/email-spec.git
branch: rails3
git: git://github.com/bmabey/email-spec.git
ref: 9297abaf30fa55c3a2cc71e5384964966ed8f640
- Git:
- uri: http://github.com/alexrabarts/big_sitemap.git
- git: http://github.com/alexrabarts/big_sitemap.git
- ref: 9240c6a036233b1ca621e2508f454df90b0a9b2e
+ uri: git://github.com/mislav/will_paginate.git
+ branch: rails3
+ git: git://github.com/mislav/will_paginate.git
+ ref: 60aa1c7b2ef03ee7c7a5ed657efb479a69f7d128
+- Git:
+ uri: git://github.com/odorcicd/authlogic.git
+ branch: rails3
+ git: git://github.com/odorcicd/authlogic.git
+ ref: a087ad0cba3c165ba22fcf176c28b6f7517931e8
- Rubygems:
uri: http://rubygems.org
@@ -4,7 +4,7 @@
# helper :layout
module LayoutHelper
def title(page_title, show_title = true)
- @content_for_title = page_title.to_s
+ content_for(:title) { page_title.to_s }
@show_title = show_title
end
@@ -26,6 +26,6 @@ def render_links_for_tags(taggings)
content_tag(:div, "Sorry, we haven't found any updated links for the tags you are tracking.", { :class => 'notice' })
else
result.join
- end
+ end.html_safe
end
end
@@ -1,6 +1,6 @@
<h1>Edit account profile</h1>
-<% form_for @user, :url => account_path do |f| %>
+<%= form_for @user, :url => account_path do |f| %>
<%= f.error_messages %>
<%= render :partial => "form", :object => f %>
<%= f.submit "Update account" %>
@@ -2,7 +2,7 @@
<div class="clear">&nbsp;</div>
-<% form_for @user, :url => account_path do |f| %>
+<%= form_for @user, :url => account_path do |f| %>
<div class="container_12">
<div class="grid_4">
@@ -2,7 +2,7 @@
<div class="clear">&nbsp;</div>
-<% form_for @super_user_session, :url => admin_super_user_session_path do |f| %>
+<%= form_for @super_user_session, :url => admin_super_user_session_path do |f| %>
<div class="container_12">
<div class="grid_4">
<%= f.label :login %><br />
@@ -23,7 +23,7 @@
<div class="container_12">
<div class="grid_5">
<h1>
- <%= link_to "URL<span>Agg</span>", root_path %>
+ <%= link_to "URL<span>Agg</span>".html_safe, root_path %>
</h1>
<span>URL Aggregator</span>
</div>
@@ -1,6 +1,6 @@
<h1>Reset Password</h1>
-<% form_for @user, :url => password_reset_path, :method => :put do |f| %>
+<%= form_for @user, :url => password_reset_path, :method => :put do |f| %>
<%= f.error_messages %>
<%= f.label :password %><br />
<%= f.password_field :password %><br />
@@ -3,8 +3,8 @@
Fill out the form below and instructions to reset your password will be emailed to you:<br />
<br />
-<% form_tag password_resets_path do %>
- <label>Email:</label><br />
+<%= form_tag password_resets_path do %>
+ <label for="email">Email:</label><br />
<%= text_field_tag "email" %><br />
<br />
<%= submit_tag "Reset my password" %>
@@ -11,7 +11,7 @@
<%- unless hide_source_tags
if tags.size > 0 -%>
<div class="source_tags">
- <div class="label">source tags:</div> <div class="tags"><%= tags.map { |t| "<a href=\"/tags/#{h(t)}\">#{h(t)}</a>" }.join(', ') -%></div>
+ <div class="label">source tags:</div> <div class="tags"><%= tags.map { |t| "<a href=\"/tags/#{h(t)}\">#{h(t)}</a>" }.join(', ').html_safe -%></div>
</div>
<div class="clear"></div>
<%- end -%>
@@ -1,4 +1,4 @@
-<div class="tag">
+<div class="tag" id="<%= dom_id(tag) %>">
<h3><%= link_to h(tag.name), tag_path(tag) %></h3>
<%= link_to('mark read', read_tag_path(tag), :id => dom_id(tag, 'mark_read'), :method => :post) %>
<ul>
@@ -4,7 +4,7 @@
<%= link_to 'Mark all read', user_path(current_user), :method => :put, :params => { :last_viewed_tags_index_at => Time.now } %>
</div>
<div class="action grid_4 r">
- <% form_for @tag, :url => taggings_path do |f| -%>
+ <%= form_for @tag, :url => taggings_path do |f| -%>
<%= f.label :name, "Add tag" %>
<%= f.text_field :name, :size => 15 %>
<%= f.submit "Track" %>
@@ -10,7 +10,7 @@
</p>
<p>
<%- if current_user -%>
- <%= link_to "Start tracking <strong>#{h(@tag)}</strong>",
+ <%= link_to "Start tracking <strong>#{h(@tag)}</strong>".html_safe,
taggings_path(:tag => {:name => @tag.name}), :method => :post, :class => 'action important' %> |
<%- end -%>
<%= link_to 'Go back to tags', tags_path, :class => 'action' %>
@@ -4,12 +4,12 @@
<link rel="alternate" href="<%= summary_tag_url(@tag, :format => 'atom') %>" type="application/atom+xml" title="Daily links for <%= @tag.name %>">
<%- end -%>
<div class="grid_6 r">
- <%= link_to '&laquo; Back to tags', tags_path, :class => 'action' %> |
+ <%= link_to '&laquo; Back to tags'.html_safe, tags_path, :class => 'action' %> |
<%- if current_user
if current_user.tags.include?(@tag) -%>
- <%= link_to "Stop tracking <strong>#{h(@tag)}</strong>", tagging_path(@tag), :confirm => 'Are you sure?', :method => :delete, :class => 'action important' %>
+ <%= link_to "Stop tracking <strong>#{h(@tag)}</strong>".html_safe, tagging_path(@tag), :confirm => 'Are you sure?', :method => :delete, :class => 'action important' %>
<%- else -%>
- <%= link_to "Start tracking <strong>#{h(@tag)}</strong>", taggings_path(:tag => {:name => @tag.name}), :method => :post, :class => 'action important' %>
+ <%= link_to "Start tracking <strong>#{h(@tag)}</strong>".html_safe, taggings_path(:tag => {:name => @tag.name}), :method => :post, :class => 'action important' %>
<%- end -%>
<%- end -%>
</div>
@@ -2,7 +2,7 @@
<div class="clear">&nbsp;</div>
-<% form_for @user_session, :url => user_session_path do |f| %>
+<%= form_for @user_session, :url => user_session_path do |f| %>
<div class="container_12">
<div class="grid_4">
<%= f.label :login %><br />
Oops, something went wrong.

0 comments on commit 4178539

Please sign in to comment.