Skip to content

Commit

Permalink
got default tests to pass
Browse files Browse the repository at this point in the history
  • Loading branch information
Elise Worthy committed Apr 11, 2012
1 parent eb61dac commit 3d04617
Show file tree
Hide file tree
Showing 16 changed files with 696 additions and 738 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -13,3 +13,5 @@
# Ignore all logfiles and tempfiles. # Ignore all logfiles and tempfiles.
/log/*.log /log/*.log
/tmp /tmp

coverage
3 changes: 2 additions & 1 deletion Gemfile
Expand Up @@ -26,5 +26,6 @@ group :development, :test do
gem 'capybara' gem 'capybara'
gem 'launchy' gem 'launchy'
gem 'guard-rspec' gem 'guard-rspec'
# gem 'factory_girl_rails' gem 'simplecov'
gem 'factory_girl_rails'
end end
30 changes: 20 additions & 10 deletions Gemfile.lock
Expand Up @@ -48,14 +48,19 @@ GEM
coffee-script (2.2.0) coffee-script (2.2.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.2.0) coffee-script-source (1.3.1)
commonjs (0.2.5) commonjs (0.2.5)
diff-lcs (1.1.3) diff-lcs (1.1.3)
dynamic_form (1.1.4) dynamic_form (1.1.4)
erubis (2.7.0) erubis (2.7.0)
execjs (1.3.0) execjs (1.3.0)
multi_json (~> 1.0) multi_json (~> 1.0)
fabrication (1.3.2) fabrication (1.3.2)
factory_girl (3.1.0)
activesupport (>= 3.0.0)
factory_girl_rails (3.1.0)
factory_girl (~> 3.1.0)
railties (>= 3.0.0)
faraday (0.7.6) faraday (0.7.6)
addressable (~> 2.2) addressable (~> 2.2)
multipart-post (~> 1.1) multipart-post (~> 1.1)
Expand All @@ -64,16 +69,16 @@ GEM
guard (1.0.1) guard (1.0.1)
ffi (>= 0.5.0) ffi (>= 0.5.0)
thor (~> 0.14.6) thor (~> 0.14.6)
guard-rspec (0.6.0) guard-rspec (0.7.0)
guard (>= 0.10.0) guard (>= 0.10.0)
hike (1.2.1) hike (1.2.1)
i18n (0.6.0) i18n (0.6.0)
journey (1.0.3) journey (1.0.3)
jquery-rails (2.0.1) jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0) railties (>= 3.2.0, < 5.0)
thor (~> 0.14) thor (~> 0.14)
json (1.6.6) json (1.6.6)
launchy (2.0.5) launchy (2.1.0)
addressable (~> 2.2.6) addressable (~> 2.2.6)
less (2.1.0) less (2.1.0)
commonjs (~> 0.2.0) commonjs (~> 0.2.0)
Expand Down Expand Up @@ -127,15 +132,15 @@ GEM
rspec-expectations (~> 2.9.0) rspec-expectations (~> 2.9.0)
rspec-mocks (~> 2.9.0) rspec-mocks (~> 2.9.0)
rspec-core (2.9.0) rspec-core (2.9.0)
rspec-expectations (2.9.0) rspec-expectations (2.9.1)
diff-lcs (~> 1.1.3) diff-lcs (~> 1.1.3)
rspec-mocks (2.9.0) rspec-mocks (2.9.0)
rspec-rails (2.9.0) rspec-rails (2.9.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec (~> 2.9.0) rspec (~> 2.9.0)
rubyzip (0.9.6.1) rubyzip (0.9.7)
sass (3.1.15) sass (3.1.15)
sass-rails (3.2.5) sass-rails (3.2.5)
railties (~> 3.2.0) railties (~> 3.2.0)
Expand All @@ -146,9 +151,12 @@ GEM
ffi (~> 1.0) ffi (~> 1.0)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
sorcery (0.7.8) simplecov (0.6.1)
multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
sorcery (0.7.7)
bcrypt-ruby (~> 3.0.0) bcrypt-ruby (~> 3.0.0)
bundler (= 1.1.0)
oauth (~> 0.4.4) oauth (~> 0.4.4)
oauth2 (~> 0.5.1) oauth2 (~> 0.5.1)
sorcery sorcery
Expand All @@ -164,11 +172,11 @@ GEM
treetop (1.4.10) treetop (1.4.10)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
twitter-bootstrap-rails (2.0.5) twitter-bootstrap-rails (2.0.6)
actionpack (>= 3.1) actionpack (>= 3.1)
less-rails (~> 2.2.0) less-rails (~> 2.2.0)
railties (>= 3.1) railties (>= 3.1)
tzinfo (0.3.32) tzinfo (0.3.33)
uglifier (1.2.4) uglifier (1.2.4)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
Expand All @@ -184,13 +192,15 @@ DEPENDENCIES
coffee-rails (~> 3.2.1) coffee-rails (~> 3.2.1)
dynamic_form dynamic_form
fabrication fabrication
factory_girl_rails
guard-rspec guard-rspec
jquery-rails jquery-rails
launchy launchy
rails (= 3.2.3) rails (= 3.2.3)
rails3-generators rails3-generators
rspec-rails rspec-rails
sass-rails (~> 3.2.3) sass-rails (~> 3.2.3)
simplecov
sorcery sorcery
sqlite3 sqlite3
twitter-bootstrap-rails twitter-bootstrap-rails
Expand Down
6 changes: 3 additions & 3 deletions app/views/orders/_form.html.erb
Expand Up @@ -13,17 +13,17 @@
<% end %> <% end %>


<div class="field"> <div class="field">
<%=f.label :name %> <%=f.label "Ship to " + :name.to_s %>
<br /> <br />
<%=f.text_field :name, size: 40 %> <%=f.text_field :name, size: 40 %>
</div> </div>
<div class="field"> <div class="field">
<%=f.label :address %> <%=f.label "Ship to " + :address.to_s %>
<br /> <br />
<%=f.text_area :address, rows: 3, cols: 40 %> <%=f.text_area :address, rows: 3, cols: 40 %>
</div> </div>
<div class="field"> <div class="field">
<%=f.label :email %> <%=f.label "Confirmation " + :email.to_s %>
<br /> <br />
<%=f.email_field :email, size: 40 %> <%=f.email_field :email, size: 40 %>
</div> </div>
Expand Down

0 comments on commit 3d04617

Please sign in to comment.