Skip to content
Browse files

Merge branch 'master' into making_it_pretty

  • Loading branch information...
2 parents 37a6387 + dd7d451 commit 8683b82b082e12eee3b3eda44f48c84d5ba46d97 Paul Panarese committed Jan 13, 2011
View
2 app/views/snacks/index.html.erb
@@ -32,7 +32,7 @@
<div class="form_instructions">
<p>Don't see your snack on the list? </p>
- <center><button id="show_form">Click Here to Add it</button> </center>
+ <a id="show_form">Click Here to Add it</a>
</div>
<%= render :partial => "snack_form" %>
View
3 features/step_definitions/snack_creation_steps.rb
@@ -12,6 +12,9 @@
When /^I create a new snack using the snack form$/ do
visit(snacks_path)
+ page.find(:xpath, "//a[contains(@id, 'show_form')]").click
+ save_and_open_page
+ # click_link("#show_form")
# within(".form_container") do
fill_in "snack_name", :with => "cheeseitz"
fill_in "snack_category", :with => "junk"
View
2 features/support/env.rb
@@ -15,7 +15,7 @@
require 'capybara/rails'
require 'capybara/cucumber'
require 'capybara/session'
-require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
+# require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
# order to ease the transition to Capybara we set the default here. If you'd
# prefer to use XPath just remove this line and adjust any selectors in your
View
2 public/stylesheets/style.css
@@ -143,7 +143,7 @@ table tbody tr:hover{
margin-top: 20px;
border: 2px solid #999;
padding: 5px;
-/* display:none;*/
+ display:none;
}
.form_container .field{

0 comments on commit 8683b82

Please sign in to comment.
Something went wrong with that request. Please try again.