activeadmin 0.6.0 → 0.6.1

data/features/step_definitions/dashboard_steps.rb

@@ -7,9 +7,9 @@ Then /^I should not see the default welcome message$/ do
 end
 
 Then /^I should see a dashboard widget "([^"]*)"$/ do |name|
-  page.should have_css('.dashboard .panel h3', :text => name) 
+  page.should have_css('.dashboard .panel h3', :text => name)
 end
 
 Then /^I should not see a dashboard widget "([^"]*)"$/ do |name|
-  page.should_not have_css('.dashboard .panel h3', :text => name) 
+  page.should_not have_css('.dashboard .panel h3', :text => name)
 end

data/features/step_definitions/factory_steps.rb

@@ -1,29 +1,15 @@
-Given /^a post with the title "([^"]*)" exists$/ do |title|
-  Post.create! :title => title
-end
-
-Given /^a post with the title "([^"]*)" and body "([^"]*)" exists$/ do |title, body|
-  Post.create! :title => title, :body => body
-end
-
-Given /^a (published )?post with the title "([^"]*)" written by "([^"]*)" exists$/ do |published, title, author_name|
-  first, last = author_name.split(' ')
-  author = User.find_or_create_by_first_name_and_last_name(first, last, :username => author_name.gsub(' ', '').underscore)
-  published_at = published ? Time.now : nil
-  Post.create! :title => title, :author => author, :published_at => published_at
-end
-
-Given /^(\d+)( published)? posts? written by "([^"]*)" exist$/ do |count, published, author_name|
-  first, last = author_name.split(' ')
-  author = User.find_or_create_by_first_name_and_last_name(first, last, :username => author_name.gsub(' ', '').underscore)
-  (0...count.to_i).each do |i|
-    Post.create! :title => "Hello World #{i}", :author => author, :published_at => (published ? Time.now : nil)
-  end
-end
-
-Given /^(\d+)( published)? posts? exists?$/ do |count, published|
-  (0...count.to_i).each do |i|
-    Post.create! :title => "Hello World #{i}", :published_at => (published ? Time.now : nil)
+def create_user(name, type = 'User')
+  type.camelize.constantize.
+    find_or_create_by_first_name_and_last_name *name.split(' '), :username => name.gsub(' ', '').underscore
+end
+
+Given /^(a|\d+)( published)? posts?(?: with the title "([^"]*)")?(?: and body "([^"]*)")?(?: written by "([^"]*)")? exists?$/ do |count, published, title, body, user|
+  count     = count == 'a' ? 1 : count.to_i
+  published = Time.now          if published
+  author    = create_user(user) if user
+  title   ||= "Hello World %i"
+  count.times do |i|
+    Post.create! :title => title % i, :body => body, :author => author, :published_at => published
   end
 end
 
@@ -32,9 +18,11 @@ Given /^a category named "([^"]*)" exists$/ do |name|
 end
 
 Given /^a (user|publisher) named "([^"]*)" exists$/ do |type, name|
-  first, last = name.split(" ")
-  type = type.camelize.constantize
-  type.create! :first_name => first, :last_name => last, :username => name
+  create_user name, type
+end
+
+Given /^a store named "([^"]*)" exists$/ do |name|
+  Store.create! :name => name
 end
 
 Given /^I create a new post with the title "([^"]*)"$/ do |title|
@@ -43,7 +31,3 @@ Given /^I create a new post with the title "([^"]*)"$/ do |title|
   fill_in :title, :with => title
   click_button "Create Post"
 end
-
-Given /^a store named "([^"]*)" exists$/ do |name|
-  Store.create! :name => name
-end

data/features/step_definitions/filter_steps.rb

@@ -3,7 +3,7 @@ Then /^I should see a select filter for "([^"]*)"$/ do |label|
 end
 
 Then /^I should see a string filter for "([^"]*)"$/ do |label|
-  page.should have_css(".filter_string label", :text => "Search #{label}")
+  page.should have_css(".filter_string label", :text => label)
 end
 
 Then /^I should see a date range filter for "([^"]*)"$/ do |label|
@@ -12,6 +12,6 @@ end
 
 Then /^I should see the following filters:$/ do |table|
   table.rows_hash.each do |label, type|
-    step "I should see a #{type} filter for \"#{label}\""
+    step %{I should see a #{type} filter for "#{label}"}
   end
 end

data/features/step_definitions/format_steps.rb

@@ -10,20 +10,17 @@ Then "I should see nicely formatted datetimes" do
   page.body.should =~ /\w+ \d{1,2}, \d{4} \d{2}:\d{2}/
 end
 
-Then /^I should see a link to download "([^"]*)"$/ do |format_type|
-  page.should have_css("#index_footer a", :text => format_type)
-end
-
-Then /^I should not see a link to download "([^"]*)"$/ do |format_type|
-  page.should_not have_css("#index_footer a", :text => format_type)
+Then /^I should( not)? see a link to download "([^"]*)"$/ do |negate, format|
+  method = negate ? :should_not : :should
+  page.send method, have_css("#index_footer a", :text => format)
 end
 
 # Check first rows of the displayed CSV.
 Then /^I should download a CSV file with "([^"]*)" separator for "([^"]*)" containing:$/ do |sep, resource_name, table|
-  page.response_headers['Content-Type'].should == 'text/csv; charset=utf-8'
-  csv_filename = "#{resource_name}-#{Time.now.strftime("%Y-%m-%d")}.csv"
-  page.response_headers['Content-Disposition'].should == %{attachment; filename="#{csv_filename}"}
-  body = page.driver.response.body
+  body    = page.driver.response.body
+  headers = page.response_headers
+  headers['Content-Type'].should        eq 'text/csv; charset=utf-8'
+  headers['Content-Disposition'].should eq %{attachment; filename="#{resource_name}-#{Time.now.strftime("%Y-%m-%d")}.csv"}
 
   begin
     csv = CSVLib.parse(body, :col_sep => sep)
@@ -33,7 +30,7 @@ Then /^I should download a CSV file with "([^"]*)" separator for "([^"]*)" conta
         if expected_cell.blank?
           cell.should be_nil
         else
-          (cell || '').should match(/#{expected_cell}/)
+          (cell || '').should match /#{expected_cell}/
         end
       end
     end
@@ -47,10 +44,9 @@ Then /^I should download a CSV file with "([^"]*)" separator for "([^"]*)" conta
 end
 
 Then /^I should download a CSV file for "([^"]*)" containing:$/ do |resource_name, table|
-  step "I should download a CSV file with \",\" separator for \"#{resource_name}\" containing:", table
+  step %{I should download a CSV file with "," separator for "#{resource_name}" containing:}, table
 end
 
 Then /^the CSV file should contain "([^"]*)" in quotes$/ do |text|
-  body = page.driver.response.body
-  body.should match(/\"#{text}\"/)
+  page.driver.response.body.should match /"#{text}"/
 end

data/features/step_definitions/index_scope_steps.rb

@@ -1,13 +1,7 @@
-Then /^I should see the scope "([^"]*)"$/ do |name|
-  step %{I should see "#{name}" within ".scopes"}
-end
-
-Then /^I should not see the scope "([^"]*)"$/ do |name|
-  step %{I should not see "#{name}" within ".scopes"}
-end
-
-Then /^I should see the scope "([^"]*)" selected$/ do |name|
-  step %{I should see "#{name}" within ".scopes .selected"}
+Then /^I should( not)? see the scope "([^"]*)"( selected)?$/ do |negate, name, selected|
+  should = "I should#{' not' if negate}"
+  scope = ".scopes#{' .selected' if selected}"
+  step %{#{should} see "#{name}" within "#{scope}"}
 end
 
 Then /^I should see the scope "([^"]*)" not selected$/ do |name|
@@ -16,22 +10,12 @@ Then /^I should see the scope "([^"]*)" not selected$/ do |name|
 end
 
 Then /^I should see the scope "([^"]*)" with the count (\d+)$/ do |name, count|
-  step %{I should see "#{count}" within ".scopes .#{name.gsub(" ", "").underscore.downcase} .count"}
+  name = name.gsub(' ','').underscore.downcase
+  step %{I should see "#{count}" within ".scopes .#{name} .count"}
 end
 
 Then /^I should see the scope "([^"]*)" with no count$/ do |name|
-  page.should have_css(".scopes .#{name.gsub(" ", "").underscore.downcase}")
-  page.should_not have_css(".scopes .#{name.gsub(" ", "").underscore.downcase} .count")
-end
-
-Then /^I should see (\d+) ([\w]*) in the table$/ do |count, resource_type|
-  begin
-    page.should have_css("table#index_table_#{resource_type} tr > td:first", :count => count.to_i)
-  rescue
-    current_count = 0
-
-    all("table#index_table_#{resource_type} tr > td:first").each { current_count += 1 }
-
-    raise "There were #{current_count} rows in the table not #{count}"
-  end
+  name = name.gsub(" ", "").underscore.downcase
+  page.should     have_css(".scopes .#{name}")
+  page.should_not have_css(".scopes .#{name} .count")
 end

data/features/step_definitions/index_views_steps.rb

@@ -1,3 +1,3 @@
 When /^I click "(.*?)"$/ do |link|
   click_link(link)
-end
+end

data/features/step_definitions/sidebar_steps.rb

@@ -3,5 +3,6 @@ Then /^I should see a sidebar titled "([^"]*)"$/ do |title|
 end
 
 Then /^I should not see a sidebar titled "([^"]*)"$/ do |title|
-  page.all(:css, "##{title.gsub(" ", '').underscore}_sidebar_section").count.should == 0
+  title = title.gsub(' ', '').underscore
+  page.all(:css, "##{title}_sidebar_section").count.should == 0
 end

data/features/step_definitions/site_title_steps.rb

@@ -12,4 +12,4 @@ end
 
 Then /^I should see the site title image linked to "([^"]*)"$/ do |url|
   page.should have_css('h1#site_title a', :href => url)
-end
+end

data/features/step_definitions/table_steps.rb

@@ -1,3 +1,8 @@
+Then /^I should see (\d+) ([\w]*) in the table$/ do |count, resource_type|
+  all("table.index_table tr > td:first").count.should eq count.to_i
+end
+
+# TODO: simplify this, if possible?
 class HtmlTableToTextHelper
   def initialize(html, table_css_selector = "table")
     @html = html
@@ -10,7 +15,7 @@ class HtmlTableToTextHelper
       row.css('th, td').map do |td|
         cell_to_string(td)
       end
-    end 
+    end
   end
 
   private

data/features/step_definitions/user_steps.rb

@@ -1,55 +1,40 @@
-Given /^I am logged out$/ do
-  if page.all(:css, "a", :text => "Logout").size > 0
-    click_link "Logout"
+def ensure_user_created(email)
+  user = AdminUser.find_or_create_by_email :email => email,
+         :password => 'password', :password_confirmation => 'password'
+
+  unless user.persisted?
+    raise "Could not create user #{email}: #{user.errors.full_messages}"
   end
+  user
+end
+
+Given /^(?:I am logged|log) out$/ do
+  click_link 'Logout' if page.all(:css, "a", :text => 'Logout').any?
 end
 
 Given /^I am logged in$/ do
-  create_admin_user_and_logout_if_needed
-  user = AdminUser.find_by_email "admin@example.com"
-  login_as(user)
+  step 'log out'
+  login_as ensure_user_created 'admin@example.com'
 end
 
 # only for @requires-reloading scenario
 Given /^I am logged in with capybara$/ do
-  create_admin_user_and_logout_if_needed
+  ensure_user_created 'admin@example.com'
+  step 'log out'
 
   visit new_admin_user_session_path
-  fill_in "Email", :with => "admin@example.com"
-  fill_in "Password", :with => "password"
-  click_button "Login"
+  fill_in 'Email',    :with => 'admin@example.com'
+  fill_in 'Password', :with => 'password'
+  click_button 'Login'
 end
 
-def create_admin_user_and_logout_if_needed
-  step 'an admin user "admin@example.com" exists'
-
-  if page.all(:css, "a", :text => "Logout").size > 0
-    click_link "Logout"
-  end
+Given /^an admin user "([^"]*)" exists$/ do |email|
+  ensure_user_created(email)
 end
 
-Given /^an admin user "([^"]*)" exists$/ do |admin_email|
-  user = AdminUser.find_or_create_by_email :email => admin_email,
-                                           :password => "password",
-                                           :password_confirmation => "password"
-
-  unless user.persisted?
-    puts "Coult not create an admin user #{admin_email}: #{user.errors.full_messages}"
-    raise "Could not create an admin user"
-  end
-end
-
-Given /^an admin user "([^"]*)" exists with (expired )?reset password token "(.*?)"$/ do |admin_email, expired, token|
-  user = AdminUser.find_or_create_by_email :email => admin_email,
-                                           :password => "password",
-                                           :password_confirmation => "password"
-
-  unless user.persisted?
-    puts "Coult not create an admin user #{admin_email}: #{user.errors.full_messages}"
-    raise "Could not create an admin user"
-  end
-
-  user.reset_password_token = token
+Given /^an admin user "([^"]*)" exists with( expired)? reset password token "(.*?)"$/ do |email, expired, token|
+  user = ensure_user_created(email)
+  user.reset_password_token   = token
   user.reset_password_sent_at = 1.minute.ago unless expired
   user.save
 end

data/features/step_definitions/web_steps.rb

@@ -1,26 +1,4 @@
-# TL;DR: YOU SHOULD DELETE THIS FILE
-#
-# This file was generated by Cucumber-Rails and is only here to get you a head start
-# These step definitions are thin wrappers around the Capybara/Webrat API that lets you
-# visit pages, interact with widgets and make assertions about page content.
-#
-# If you use these step definitions as basis for your features you will quickly end up
-# with features that are:
-#
-# * Hard to maintain
-# * Verbose to read
-#
-# A much better approach is to write your own higher level step definitions, following
-# the advice in the following blog posts:
-#
-# * http://benmabey.com/2008/05/19/imperative-vs-declarative-scenarios-in-user-stories.html
-# * http://dannorth.net/2011/01/31/whose-domain-is-it-anyway/
-# * http://elabs.se/blog/15-you-re-cuking-it-wrong
-#
-
-
 require 'uri'
-require 'cgi'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
 
@@ -41,169 +19,62 @@ When /^(.*) within (.*[^:]):$/ do |step_name, parent, table_or_string|
   with_scope(parent) { step "#{step_name}:", table_or_string }
 end
 
-Given /^(?:|I )am on (.+)$/ do |page_name|
+Given /^(?:I )am on (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^(?:|I )go to (.+)$/ do |page_name|
+When /^(?:I )go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^(?:|I )press "([^"]*)"$/ do |button|
+When /^(?:I )press "([^"]*)"$/ do |button|
   click_button(button)
 end
 
-When /^(?:|I )follow "([^"]*)"$/ do |link|
+When /^(?:I )follow "([^"]*)"$/ do |link|
   click_link(link)
 end
 
-When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
-end
-
-When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
+When /^(?:I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
   fill_in(field, :with => value)
 end
 
-# Use this to fill in an entire form with data from a table. Example:
-#
-#   When I fill in the following:
-#     | Account Number | 5002       |
-#     | Expiry date    | 2009-11-01 |
-#     | Note           | Nice guy   |
-#     | Wants Email?   |            |
-#
-# TODO: Add support for checkbox, select og option
-# based on naming conventions.
-#
-When /^(?:|I )fill in the following:$/ do |fields|
-  fields.rows_hash.each do |name, value|
-    When %{I fill in "#{name}" with "#{value}"}
-  end
-end
-
-When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
+When /^(?:I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
   select(value, :from => field)
 end
 
-When /^(?:|I )check "([^"]*)"$/ do |field|
-  check(field)
-end
-
-When /^(?:|I )uncheck "([^"]*)"$/ do |field|
-  uncheck(field)
+When /^(?:I )(check|uncheck|choose) "([^"]*)"$/ do |action, field|
+  send action, field
 end
 
-When /^(?:|I )choose "([^"]*)"$/ do |field|
-  choose(field)
-end
-
-When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
+When /^(?:I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
   attach_file(field, File.expand_path(path))
 end
 
-Then /^(?:|I )should see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_content(text)
-  else
-    assert page.has_content?(text)
-  end
-end
-
-Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_xpath('//*', :text => regexp)
-  else
-    assert page.has_xpath?('//*', :text => regexp)
-  end
-end
-
-Then /^(?:|I )should not see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_no_content(text)
-  else
-    assert page.has_no_content?(text)
-  end
-end
-
-Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_no_xpath('//*', :text => regexp)
-  else
-    assert page.has_no_xpath?('//*', :text => regexp)
-  end
+Then /^(?:I )should( not)? see( the element)? "([^"]*)"$/ do |negate, is_css, text|
+  should = negate ? :should_not    : :should
+  have   = is_css ? have_css(text) : have_content(text)
+  page.send should, have
 end
 
-Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
+Then /^the "([^"]*)" field(?: within (.*))? should( not)? contain "([^"]*)"$/ do |field, parent, negate, value|
   with_scope(parent) do
     field = find_field(field)
     field_value = (field.tag_name == 'textarea') ? field.text : field.value
-    if field_value.respond_to? :should
-      field_value.should =~ /#{value}/
-    else
-      assert_match(/#{value}/, field_value)
-    end
+    negate ? field_value.should_not =~ /#{value}/ : field_value.should =~ /#{value}/
   end
 end
 
-Then /^the "([^"]*)" field(?: within (.*))? should not contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    field_value = (field.tag_name == 'textarea') ? field.text : field.value
-    if field_value.respond_to? :should_not
-      field_value.should_not =~ /#{value}/
-    else
-      assert_no_match(/#{value}/, field_value)
-    end
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, parent|
+Then /^the "([^"]*)" checkbox(?: within (.*))? should( not)? be checked$/ do |label, parent, negate|
   with_scope(parent) do
     field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_true
-    else
-      assert field_checked
-    end
+    field_checked.should negate ? be_false : be_true
   end
 end
 
-Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_false
-    else
-      assert !field_checked
-    end
-  end
-end
- 
 Then /^(?:|I )should be on (.+)$/ do |page_name|
   current_path = URI.parse(current_url).path
-  if current_path.respond_to? :should
-    current_path.should == path_to(page_name)
-  else
-    assert_equal path_to(page_name), current_path
-  end
-end
-
-Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
-  query = URI.parse(current_url).query
-  actual_params = query ? CGI.parse(query) : {}
-  expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
-  
-  if actual_params.respond_to? :should
-    actual_params.should == expected_params
-  else
-    assert_equal expected_params, actual_params
-  end
+  current_path.should == path_to(page_name)
 end
 
 Then /^show me the page$/ do