activeadmin 0.4.4 → 0.5.0.pre

data/features/step_definitions/factory_steps.rb

@@ -13,6 +13,14 @@ Given /^a (published )?post with the title "([^"]*)" written by "([^"]*)" exists
   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)
@@ -35,3 +43,7 @@ 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/format_steps.rb

@@ -19,14 +19,14 @@ Then /^I should not see a link to download "([^"]*)"$/ do |format_type|
 end
 
 # Check first rows of the displayed CSV.
-Then /^I should download a CSV file for "([^"]*)" containing:$/ do |resource_name, table|
+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
 
   begin
-    csv = CSVLib.parse(body)
+    csv = CSVLib.parse(body, :col_sep => sep)
     table.raw.each_with_index do |expected_row, row_index|
       expected_row.each_with_index do |expected_cell, col_index|
         cell = csv.try(:[], row_index).try(:[], col_index)
@@ -45,3 +45,7 @@ Then /^I should download a CSV file for "([^"]*)" containing:$/ do |resource_nam
     raise $!
   end
 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
+end

data/features/step_definitions/i18n_steps.rb

@@ -0,0 +1,3 @@
+When /^I set my locale to "([^"]*)"$/ do |lang|
+  I18n.locale = lang
+end

data/features/step_definitions/table_steps.rb

@@ -0,0 +1,114 @@
+class HtmlTableToTextHelper
+  def initialize(html, table_css_selector = "table")
+    @html = html
+    @selector = table_css_selector
+  end
+
+  def to_array
+    rows = Nokogiri::HTML(@html).css("#{@selector} tr")
+    rows.map do |row|
+      row.css('th, td').map do |td|
+        cell_to_string(td)
+      end
+    end 
+  end
+
+  private
+
+  def cell_to_string(td)
+    str = ""
+    input = td.css('input').last
+
+    if input
+      str << input_to_string(input)
+    end
+
+    str << td.content.strip.gsub("\n", ' ')
+  end
+
+  def input_to_string(input)
+    case input.attribute("type").value
+    when "checkbox"
+      if input.attribute("disabled")
+        "_"
+      else
+        if input.attribute("checked")
+          "[X]"
+        else
+          "[ ]"
+        end
+      end
+    when "text"
+      if input.attribute("value").present?
+        "[#{input.attribute("value")}]"
+      else
+        "[ ]"
+      end
+    when "submit"
+      input.attribute("value")
+    else
+      raise "I don't know what to do with #{input}"
+    end
+  end
+end
+
+module TableMatchHelper
+
+
+  # @param table [Array[Array]]
+  # @param expected_table [Array[Array[String]]]
+  # The expected_table values are String. They are converted to
+  # Regexp when they start and end with a '/'
+  # Example:
+  #
+  #   assert_table_match(
+  #     [["Name", "Date"], ["Philippe", "Feb 08"]],
+  #     [["Name", "Date"], ["Philippe", "/\w{3} \d{2}/"]]
+  #   )
+  def assert_tables_match(table, expected_table)
+    expected_table.each_index do |row_index|
+      expected_table[row_index].each_index do |column_index|
+        expected_cell = expected_table[row_index][column_index]
+        cell = table.try(:[], row_index).try(:[], column_index)
+        begin
+          assert_cells_match(cell, expected_cell)
+        rescue
+          puts "Cell at line #{row_index} and column #{column_index}: #{cell.inspect} does not match #{expected_cell.inspect}"
+          puts "Expecting:"
+          table.each { |row| puts row.inspect }
+          puts "to match:"
+          expected_table.each { |row| puts row.inspect }
+          raise $!
+        end
+      end
+    end
+  end
+
+  def assert_cells_match(cell, expected_cell)
+    if expected_cell =~ /^\/.*\/$/
+      cell.should match(Regexp.new(expected_cell[1..-2]))
+    else
+      (cell || "").strip.should == expected_cell
+    end
+  end
+
+end # module TableMatchHelper
+
+World(TableMatchHelper)
+
+
+# Usage:
+#
+#   I should see the "invoices" table:
+#     | Invoice #    | Date     | Total Amount |
+#     |    /\d+/     | 27/01/12 |       $30.00 |
+#     |    /\d+/     | 12/02/12 |       $25.00 |
+#
+Then /^I should see the "([^"]*)" table:$/ do |table_id, expected_table|
+  page.should have_css("table##{table_id}")
+
+  assert_tables_match(
+    HtmlTableToTextHelper.new(page.body, "table##{table_id}").to_array,
+    expected_table.raw
+  )
+end

data/features/step_definitions/user_steps.rb

@@ -5,11 +5,14 @@ Given /^I am logged out$/ do
 end
 
 Given /^I am logged in$/ do
-  step 'an admin user "admin@example.com" exists'
+  create_admin_user_and_logout_if_needed
+  user = AdminUser.find_by_email "admin@example.com"
+  login_as(user)
+end
 
-  if page.all(:css, "a", :text => "Logout").size > 0
-    click_link "Logout"
-  end
+# only for @requires-reloading scenario
+Given /^I am logged in with capybara$/ do
+  create_admin_user_and_logout_if_needed
 
   visit new_admin_user_session_path
   fill_in "Email", :with => "admin@example.com"
@@ -17,6 +20,14 @@ Given /^I am logged in$/ do
   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
+end
+
 Given /^an admin user "([^"]*)" exists$/ do |admin_email|
   user = AdminUser.find_or_create_by_email :email => admin_email,
                                            :password => "password",
@@ -27,3 +38,18 @@ Given /^an admin user "([^"]*)" exists$/ do |admin_email|
     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
+  user.reset_password_sent_at = 1.minute.ago unless expired
+  user.save
+end

data/features/support/env.rb

@@ -4,19 +4,18 @@
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
+ENV["RAILS_ENV"] ||= "cucumber"
 ENV['BUNDLE_GEMFILE'] = File.expand_path('../../../Gemfile', __FILE__)
+require "rubygems"
+require "bundler"
+Bundler.setup
 
 require File.expand_path('../../../spec/support/detect_rails_version', __FILE__)
 ENV["RAILS"] = detect_rails_version
 
-ENV["RAILS_ENV"] ||= "cucumber"
 ENV['RAILS_ROOT'] = File.expand_path("../../../spec/rails/rails-#{ENV["RAILS"]}", __FILE__)
 
 
-require 'rubygems'
-require "bundler"
-Bundler.setup
-
 # Create the test app if it doesn't exists
 unless File.exists?(ENV['RAILS_ROOT'])
   system 'rake setup'
@@ -79,18 +78,58 @@ if defined?(ActiveRecord::Base)
   end
 end
 
-# Create the test app if it doesn't exists
-unless File.exists?(ENV['RAILS_ROOT'])
-  system 'rake setup'  
+def add_default_dashboard
+  begin
+    dashboard_file = ENV['RAILS_ROOT'] + "/app/admin/dashboard.rb"
+    dashboard_template = File.expand_path('../../../lib/generators/active_admin/install/templates/dashboard.rb', __FILE__)
+    cmd = "cp #{dashboard_template} #{dashboard_file}"
+    system cmd
+  rescue
+    p $!
+    raise $!
+  end
+end
+
+def delete_default_dashboard
+  begin
+    dashboard_file = ENV['RAILS_ROOT'] + "/app/admin/dashboard.rb"
+    File.delete(dashboard_file) if File.exists?(dashboard_file)
+  rescue
+    p $!
+    raise $!
+  end
+end
+
+# Warden helpers to speed up login
+# See https://github.com/plataformatec/devise/wiki/How-To:-Test-with-Capybara
+include Warden::Test::Helpers
+
+After do
+  add_default_dashboard
+  Warden.test_reset!
+end
+
+Before '@dashboard' do
+  delete_default_dashboard
 end
 
-# Remove all our constants
 Before do
-  # We are cachine classes, but need to manually clear references to
-  # the controllers. If they aren't clear, the router stores references
-  ActiveSupport::Dependencies.clear
+  add_default_dashboard
 
-  # Reload Active Admin
-  ActiveAdmin.unload!
-  ActiveAdmin.load!
+  begin
+    # We are caching classes, but need to manually clear references to
+    # the controllers. If they aren't clear, the router stores references
+    ActiveSupport::Dependencies.clear
+
+    # Reload Active Admin
+    ActiveAdmin.unload!
+    ActiveAdmin.load!
+  rescue
+    p $!
+    raise $!
+  end
 end
+
+# improve the performance of the specs suite by not logging anything
+# see http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/
+Rails.logger.level = 4

data/features/support/paths.rb

@@ -14,6 +14,8 @@ module NavigationHelpers
       "/admin"
     when /the new post page/
       "/admin/posts/new"
+    when /the admin password reset form with reset password token "([^"]*)"/
+      "/admin/password/edit?reset_password_token=#{$1}"
 
     # the index page for posts in the root namespace
     # the index page for posts in the user_admin namespace

data/features/users/logging_in.feature

@@ -19,7 +19,7 @@ Feature: User Logging In
     And I should see "Logout"
     And I should see "admin@example.com"
 
-  Scenario: Attempting to log in with an incorrent email address
+  Scenario: Attempting to log in with an incorrect email address
     When I fill in "Email" with "not-an-admin@example.com"
     And I fill in "Password" with "not-my-password"
     And I press "Login"

data/features/users/logging_out.feature

@@ -21,4 +21,5 @@ Feature: User Logging out
       """
     And I am logged in
     When I go to the dashboard
-    Then I should see the default welcome message
+    And I follow "Logout"
+    Then I should see "Login"

data/features/users/resetting_password.feature

@@ -0,0 +1,34 @@
+Feature: User Resetting Password
+
+  Resetting my password as an admin user
+
+  Background:
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post
+    """
+    And I am logged out
+    And an admin user "admin@example.com" exists
+
+  Scenario: Resetting password successfully
+    When I go to the dashboard
+    And I follow "Forgot your password?"
+    When I fill in "Email" with "admin@example.com"
+    And I press "Reset My Password"
+    Then I should see "You will receive an email with instructions about how to reset your password in a few minutes."
+
+  Scenario: Changing password after resetting
+    Given an admin user "admin@example.com" exists with reset password token "123reset"
+    When I go to the admin password reset form with reset password token "123reset"
+    And I fill in "Password" with "password"
+    And I fill in "Password confirmation" with "password"
+    And I press "Change my password"
+    Then I should see "success"
+
+  Scenario: Changing password after resetting with errors
+    Given an admin user "admin@example.com" exists with expired reset password token "123reset"
+    When I go to the admin password reset form with reset password token "123reset"
+    And I fill in "Password" with "password"
+    And I fill in "Password confirmation" with "wrong"
+    And I press "Change my password"
+    Then I should see "expired"

data/lib/active_admin.rb

@@ -6,7 +6,9 @@ require 'formtastic'
 require 'sass'
 require 'inherited_resources'
 require 'jquery-rails'
-require 'active_admin/arbre'
+require 'arbre'
+require 'active_admin/dependency_checker' 
+require 'active_admin/sass/helpers'
 require 'active_admin/engine'
 
 module ActiveAdmin
@@ -21,13 +23,11 @@ module ActiveAdmin
   autoload :ControllerAction,         'active_admin/controller_action'
   autoload :CSVBuilder,               'active_admin/csv_builder'
   autoload :Dashboards,               'active_admin/dashboards'
-  autoload :DependencyChecker,        'active_admin/dependency_checker'
   autoload :Deprecation,              'active_admin/deprecation'
   autoload :Devise,                   'active_admin/devise'
   autoload :DSL,                      'active_admin/dsl'
   autoload :Event,                    'active_admin/event'
   autoload :FormBuilder,              'active_admin/form_builder'
-  autoload :FilterFormBuilder,        'active_admin/filter_form_builder'
   autoload :Inputs,                   'active_admin/inputs'
   autoload :Iconic,                   'active_admin/iconic'
   autoload :Menu,                     'active_admin/menu'
@@ -41,7 +41,6 @@ module ActiveAdmin
   autoload :Resource,                 'active_admin/resource'
   autoload :ResourceController,       'active_admin/resource_controller'
   autoload :ResourceDSL,              'active_admin/resource_dsl'
-  autoload :Renderer,                 'active_admin/renderer'
   autoload :Scope,                    'active_admin/scope'
   autoload :ScopeChain,               'active_admin/helpers/scope_chain'
   autoload :SidebarSection,           'active_admin/sidebar_section'
@@ -51,9 +50,11 @@ module ActiveAdmin
   autoload :Views,                    'active_admin/views'
 
   class Railtie < ::Rails::Railtie
-    # Add load paths straight to I18n, so engines and application can overwrite it.
-    require 'active_support/i18n'
-    I18n.load_path += Dir[File.expand_path('../active_admin/locales/*.yml', __FILE__)]
+    config.after_initialize do
+      # Add load paths straight to I18n, so engines and application can overwrite it.
+      require 'active_support/i18n'
+      I18n.load_path += Dir[File.expand_path('../active_admin/locales/*.yml', __FILE__)]
+    end
   end
 
   class << self
@@ -89,10 +90,48 @@ module ActiveAdmin
     ActiveAdmin::Deprecation.deprecate self, :default_namespace, 
       "ActiveAdmin.default_namespace is deprecated. Please use ActiveAdmin.application.default_namespace"
 
+    # A callback is triggered each time (before) Active Admin loads the configuration files.
+    # In development mode, this will happen whenever the user changes files. In production
+    # it only happens on boot.
+    #
+    # The block takes the current instance of [ActiveAdmin::Application]
+    #
+    # Example:
+    #
+    #     ActiveAdmin.before_load do |app|
+    #       # Do some stuff before AA loads
+    #     end
+    #
+    # @param [Block] block A block to call each time (before) AA loads resources
+    def before_load(&block)
+      ActiveAdmin::Event.subscribe ActiveAdmin::Application::BeforeLoadEvent, &block
+    end
+
+    # A callback is triggered each time (after) Active Admin loads the configuration files. This
+    # is an opportunity to hook into Resources after they've been loaded.
+    #
+    # The block takes the current instance of [ActiveAdmin::Application]
+    #
+    # Example:
+    #
+    #     ActiveAdmin.after_load do |app|
+    #       app.namespaces.each do |name, namespace|
+    #         puts "Namespace: #{name} loaded!"
+    #       end
+    #     end
+    #
+    # @param [Block] block A block to call each time (after) AA loads resources
+    def after_load(&block)
+      ActiveAdmin::Event.subscribe ActiveAdmin::Application::AfterLoadEvent, &block
+    end
+
   end
 
 end
 
 ActiveAdmin::DependencyChecker.check!
 
+# Require internal Plugins
 require 'active_admin/comments'
+require 'active_admin/batch_actions'
+require 'active_admin/filters'