activeadmin 0.6.0 → 0.6.1

data/features/registering_pages.feature

@@ -145,4 +145,4 @@ Feature: Registering Pages
     And I follow "Status"
     And I follow "Check"
     Then I should see the content "Chocolate lØves You Too!"
-    And I should see the Active Admin layout
+    And I should see the Active Admin layout

data/features/registering_resources.feature

@@ -8,7 +8,7 @@ Feature: Registering Resources
 
   Scenario: Registering a resource with the defaults
     Given a configuration of:
-    """ 
+    """
       ActiveAdmin.register Post
     """
     When I go to the dashboard
@@ -21,7 +21,7 @@ Feature: Registering Resources
 
   Scenario: Registering a resource with another name
     Given a configuration of:
-    """ 
+    """
       ActiveAdmin.register Post, :as => "My Post"
     """
     When I go to the dashboard

data/features/show/default_content.feature

@@ -13,7 +13,7 @@ Feature: Show - Default Content
     Then I should see the attribute "Title" with "Hello World"
     And I should see the attribute "Body" with "Empty"
     And I should see the attribute "Created At" with a nicely formatted datetime
-    And I should see the attribute "Author" with "jane_doe"
+    And I should see the attribute "Author" with "Jane Doe"
     And I should see an action item button "Delete Post"
     And I should see an action item button "Edit Post"
 
@@ -23,8 +23,8 @@ Feature: Show - Default Content
         ActiveAdmin.register Post
         ActiveAdmin.register User
       """
-    Then I should see the attribute "Author" with "jane_doe"
-    And I should see a link to "jane_doe"
+    Then I should see the attribute "Author" with "Jane Doe"
+    And I should see a link to "Jane Doe"
 
   Scenario: Customizing the attributes table with a set of attributes
     Given a show configuration of:

data/features/sidebar_sections.feature

@@ -17,7 +17,7 @@ Feature: Sidebar Sections
     """
     When I am on the index page for posts
     Then I should see a sidebar titled "Help"
-    Then I should see /Need help/ within the "Help" sidebar
+    Then I should see "Need help" within the "Help" sidebar
 
     When I follow "View"
     Then I should see a sidebar titled "Help"
@@ -41,7 +41,7 @@ Feature: Sidebar Sections
     """
     When I am on the index page for posts
     Then I should see a sidebar titled "Help"
-    Then I should see /Need help/ within the "Help" sidebar
+    Then I should see "Need help" within the "Help" sidebar
 
     When I follow "View"
     Then I should not see a sidebar titled "Help"
@@ -138,7 +138,7 @@ Feature: Sidebar Sections
 
     When I follow "View"
     Then I should see a sidebar titled "Help"
-    Then I should see /Need help/ within the "Help" sidebar
+    Then I should see "Need help" within the "Help" sidebar
 
     When I follow "Edit Post"
     Then I should not see a sidebar titled "Help"

data/features/specifying_actions.feature

@@ -46,7 +46,7 @@ Feature: Specifying Actions
           action_item(:only => :show) do
             link_to('Review', review_admin_post_path)
           end
-  
+
           member_action :review do
             @post = Post.find(params[:id])
           end

data/features/step_definitions/additional_web_steps.rb

@@ -15,7 +15,7 @@ Then /^I should not see a sortable table header with "([^"]*)"$/ do |content|
 end
 
 Then /^I should not see a sortable table header$/ do
-  step "I should not see \"th.sortable\""
+  step %{I should not see "th.sortable"}
 end
 
 Then /^the table "([^"]*)" should have (\d+) rows/ do |selector, count|
@@ -34,20 +34,7 @@ Then /^there should be (\d+) "([^"]*)" tags$/ do |count, tag|
 end
 
 Then /^I should see a link to "([^"]*)"$/ do |link|
-  if page.respond_to? :should
-    page.should have_xpath('//a', :text => link)
-  else
-    assert page.has_xpath?('//a', :text => link)
-  end
-end
-
-Then /^I should see a link to \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-  if page.respond_to? :should
-    page.should have_xpath('//a', :text => regexp)
-  else
-    assert page.has_xpath?('//a', :text => regexp)
-  end
+  page.should have_xpath('//a', :text => link)
 end
 
 Then /^an "([^"]*)" exception should be raised when I follow "([^"]*)"$/ do |error, link|
@@ -57,7 +44,7 @@ Then /^an "([^"]*)" exception should be raised when I follow "([^"]*)"$/ do |err
 end
 
 Then /^I should be in the resource section for (.+)$/ do |resource_name|
-  current_url.should include(resource_name.gsub(' ', '').underscore.pluralize)
+  current_url.should include resource_name.gsub(' ', '').underscore.pluralize
 end
 
 Then /^I should wait and see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|

data/features/step_definitions/asset_steps.rb

@@ -1,5 +1,5 @@
 Then /^I should see the css file "([^"]*)"$/ do |path|
-  step %{I should see the css file "#{path}" of media "screen"}  
+  step %{I should see the css file "#{path}" of media "screen"}
 end
 
 Then /^I should see the css file "([^"]*)" of media "([^"]*)"$/ do |path, media|
@@ -9,3 +9,7 @@ end
 Then /^I should see the js file "([^"]*)"$/ do |path|
   page.should have_xpath("//script[contains(@src, /javascripts/#{path})]")
 end
+
+Then /^I should see the favicon "([^"]*)"$/ do |path|
+  page.should have_xpath("//link[contains(@href, \"#{path}\")]")
+end

data/features/step_definitions/attribute_steps.rb

@@ -1,11 +1,11 @@
 Then /^I should see the attribute "([^"]*)" with "([^"]*)"$/ do |title, value|
-  page.should have_css('.attributes_table th', :text => title)
-  page.should have_css('.attributes_table td', :text => value)
+  elems = all ".attributes_table th:contains('#{title}') ~ td:contains('#{value}')"
+  elems.first.should_not be_nil, 'attribute missing'
 end
 
 Then /^I should see the attribute "([^"]*)" with a nicely formatted datetime$/ do |title|
-  th = page.find('.attributes_table th', :text => title)
-  page.find(:xpath, th.path.gsub(/th$/, 'td')).text.should =~ /\w+ \d{1,2}, \d{4} \d{2}:\d{2}/
+  text = all(".attributes_table th:contains('#{title}') ~ td").first.text
+  text.should match /\w+ \d{1,2}, \d{4} \d{2}:\d{2}/
 end
 
 Then /^I should not see the attribute "([^"]*)"$/ do |title|

data/features/step_definitions/batch_action_steps.rb

@@ -1,104 +1,55 @@
-Then /^I (should|should not) see the batch action "([^"]*)"$/ do |maybe, title|
-  %{Then I #{maybe} see the batch action :#{title.gsub(' ','').gsub(" Selected", "").underscore} "#{title}"}
-end
-
 Then /^I (should|should not) be asked to confirm "([^"]*)" for "([^"]*)"$/ do |maybe, confirmation, title|
-  within "#batch_actions_popover" do
-    unless maybe == "should not"
-      link = page.find "a.batch_action", :text => title
-      link["data-confirm"].should match( confirmation )
-    else
-      page.should_not have_css("a.batch_action", :text => title)
-    end
-  end
+  selector = "#batch_actions_popover a.batch_action:contains('#{title}')"
+  selector << "[data-confirm='#{confirmation}']" if maybe == 'should'
+  page.send maybe.sub(' ', '_'), have_css(selector)
 end
 
 Then /^I (should|should not) see the batch action :([^\s]*) "([^"]*)"$/ do |maybe, sym, title|
-  within "#batch_actions_selector" do
-    unless maybe == "should not"
-      link = page.find "a.batch_action", :text => title
-      link["data-action"].should match( sym )
-      link[:href].should match( "#" )
-    else
-      page.should_not have_css("a.batch_action", :text => title)
-    end
-  end
+  selector = "#batch_actions_selector a.batch_action:contains('#{title}')"
+  selector << "[href='#'][data-action='#{sym}']" if maybe == 'should'
+  page.send maybe.sub(' ', '_'), have_css(selector)
 end
 
 Then /^the (\d+)(?:st|nd|rd|th) batch action should be "([^"]*)"$/ do |index, title|
-  within "#batch_actions_selector" do
-    page.all( "a.batch_action" )[index.to_i - 1].text.should match( title )
-  end
+  page.all("#batch_actions_selector a.batch_action")[index.to_i - 1].text.should match title
 end
 
 When /^I check the (\d+)(?:st|nd|rd|th) record$/ do |index|
-  page.all( "table.index_table input[type=checkbox]" )[index.to_i].set( true )
-end
-
-When /^I uncheck the (\d+)(?:st|nd|rd|th) record$/ do |index|
-  page.all( "table.index_table input[type='checkbox']" )[index.to_i].set( false )
+  page.all("table.index_table input[type=checkbox]")[index.to_i].set true
 end
 
 When /^I toggle the collection selection$/ do
-  toggle_box = page.find( "#collection_selection_toggle_all" )
-  toggle_box.click
-end
-
-Then /^I should see (\d+) record(?:s)? selected$/ do |count|
-  within "table.index_table" do
-    unless count.to_i == 0
-      page.should have_xpath(".//input[@type='checkbox' and @checked='checked']", :count => count)
-    else
-      page.should have_no_xpath(".//input[@type='checkbox' and @checked='checked']")
-    end
-  end
+  page.find("#collection_selection_toggle_all").click
 end
 
 Then /^I should see that the batch action button is disabled$/ do
-  page.should have_css("#batch_actions_selector .dropdown_menu_button.disabled")
-end
-
-Then /^I (should|should not) see the batch action button$/ do |maybe|
-  if maybe == "should not"
-    page.should_not have_css("div.table_tools #batch_actions_selector .dropdown_menu_button")
-  else
-    page.should have_css("div.table_tools #batch_actions_selector .dropdown_menu_button")
-  end
+  page.should have_css "#batch_actions_selector .dropdown_menu_button.disabled"
 end
 
-Then "I should not see the batch actions selector" do
-  page.should_not have_css("div.table_tools #batch_actions_selector")
+Then /^I (should|should not) see the batch action (button|selector)$/ do |maybe, type|
+  selector = "div.table_tools #batch_actions_selector"
+  selector << ' .dropdown_menu_button' if maybe == 'should' && type == 'button'
+  page.send maybe.sub(' ', '_'), have_css(selector)
 end
 
 Then /^I should see the batch action popover exists$/ do
-  page.should have_css("#batch_actions_selector")
+  page.should have_css "#batch_actions_selector"
 end
 
 Given /^I submit the batch action form with "([^"]*)"$/ do |action|
-  page.find(:css, "#batch_action").set(action)
-
-  within("#main_content") do
-    @params = page.all("input").reduce({}) do |acc, input|
-      param_key = input['name']
-      param_value = input['value']
-
-      if param_key == 'collection_selection[]'
-        # the collection_selection should be sent as an array containing only IDs of checked rows
-        acc[param_key] ||= Array.new
-        acc[param_key] << param_value if input.checked?
-      else
-        # other inputs, just send the value normally
-        acc.store(param_key, param_value)
-      end
-      acc
+  page.find("#batch_action").set action
+  form   = page.find "#collection_selection"
+  params = page.all("#main_content input").each_with_object({}) do |input, obj|
+    key, value = input['name'], input['value']
+    if key == 'collection_selection[]'
+      (obj[key] ||= []).push value if input.checked?
+    else
+      obj[key] = value
     end
   end
-
-  form = page.find("#collection_selection")
-
-  page.driver.submit(form['method'].to_sym, form['action'], @params)
+  page.driver.submit form['method'], form['action'], params
 end
 
 Then /^I should not see checkboxes in the table$/ do
-  page.should_not have_css( ".paginated_collection table input[type=checkbox]" )
+  page.should_not have_css ".paginated_collection table input[type=checkbox]"
 end

data/features/step_definitions/breadcrumb_steps.rb

@@ -1,5 +1,3 @@
 Then /^I should see a link to "([^"]*)" in the breadcrumb$/ do |text|
-  within ".breadcrumb" do
-    page.should have_css("a", :text => text)
-  end
+  page.should have_css('.breadcrumb > a', :text => text)
 end

data/features/step_definitions/comment_steps.rb

@@ -7,7 +7,6 @@ When /^I add a comment "([^"]*)"$/ do |comment|
   step  %{I press "Add Comment"}
 end
 
-
 Given /^a tag with the name "([^"]*)" exists$/ do |tag_name|
   Tag.create(:name => tag_name)
 end

data/features/step_definitions/configuration_steps.rb

@@ -1,109 +1,93 @@
 module ActiveAdminReloading
-
-  def load_active_admin_configuration(configuration_content)
+  def load_aa_config(config_content)
     ActiveAdmin::Event.dispatch ActiveAdmin::Application::BeforeLoadEvent, ActiveAdmin.application
-    eval(configuration_content)
-    ActiveAdmin::Event.dispatch ActiveAdmin::Application::AfterLoadEvent, ActiveAdmin.application
+    eval(config_content)
+    ActiveAdmin::Event.dispatch ActiveAdmin::Application::AfterLoadEvent,  ActiveAdmin.application
     Rails.application.reload_routes!
-    ActiveAdmin.application.namespaces.values.each{|n| n.reset_menu! }
+    ActiveAdmin.application.namespaces.values.each &:reset_menu!
   end
-
 end
 
 module ActiveAdminContentsRollback
-
-  def self.recorded_files
+  def files
     @files ||= {}
   end
 
   # Records the contents of a file the first time we are
   # about to change it
-  def self.record(filename)
-    contents = File.read(filename) rescue nil
-    recorded_files[filename] = contents unless recorded_files.has_key?(filename)
+  def record(filename)
+    contents        = File.read(filename) rescue nil
+    files[filename] = contents            unless files.has_key? filename
   end
 
   # Rolls the recorded files back to their original states
-  def self.rollback!
-    recorded_files.each do |filename, contents|
-      # contents will be nil if the file didin't exist
-      if contents.present?
-        File.open(filename, "w") {|f| f << contents }
-      else
-        File.delete(filename)
+  def rollback!
+    files.each{ |file, contents| rollback_file(file, contents) }
+    @files = {}
+  end
 
-        # Delete parent directories
-        begin
-          dir = File.dirname(filename)
-          until dir == Rails.root
-            Dir.rmdir(dir)
-            dir = dir.split('/')[0..-2].join('/')
-          end
-        rescue Errno::ENOTEMPTY
-          # Directory not empty
+  # If the file originally had content, override the stuff on disk.
+  # Else, remove the file and its parent folder structure until Rails.root OR other files exist.
+  def rollback_file(file, contents)
+    if contents.present?
+      File.open(file,'w') { |f| f << contents }
+    else
+      File.delete(file)
+      begin
+        dir = File.dirname(file)
+        until dir == Rails.root
+          Dir.rmdir(dir)                        # delete current folder
+          dir = dir.split('/')[0..-2].join('/') # select parent folder
         end
-
+      rescue Errno::ENOTEMPTY # Directory not empty
       end
     end
-
-    @files = {}
   end
-
 end
 
 World(ActiveAdminReloading)
+World(ActiveAdminContentsRollback)
 
 After do
-  ActiveAdminContentsRollback.rollback!
+  rollback!
 end
 
-Given /^a configuration of:$/ do |configuration_content|
-  load_active_admin_configuration(configuration_content)
-end
-
-Given /^an index configuration of:$/ do |configuration_content|
-  load_active_admin_configuration(configuration_content)
-
-  step 'I am logged in'
-  step "I am on the index page for posts"
-end
-
-Given /^a show configuration of:$/ do |configuration_content|
-  resource = configuration_content.match(/ActiveAdmin\.register (\w+)/)[1]
-  load_active_admin_configuration(configuration_content)
+Given /^a(?:n? (index|show))? configuration of:$/ do |action, config_content|
+  load_aa_config(config_content)
 
-  case resource
-  when "Post"
+  case action
+  when 'index'
     step 'I am logged in'
-    step "I am on the index page for posts"
-    step 'I follow "View"'
-  when "Tag"
-    step 'I am logged in'
-    Tag.create!
-    visit admin_tag_path(Tag.last)
-  else
-    raise "#{resource} is not supported"
+    step 'I am on the index page for posts'
+  when 'show'
+    case resource = config_content.match(/ActiveAdmin\.register (\w+)/)[1]
+    when 'Post'
+      step 'I am logged in'
+      step 'I am on the index page for posts'
+      step 'I follow "View"'
+    when 'Tag'
+      step 'I am logged in'
+      Tag.create!
+      visit admin_tag_path Tag.last
+    else
+      raise "#{resource} is not supported"
+    end
   end
 end
 
 Given /^"([^"]*)" contains:$/ do |filename, contents|
-  require 'fileutils'
-  filepath = Rails.root + filename
-  FileUtils.mkdir_p File.dirname(filepath)
-  ActiveAdminContentsRollback.record(filepath)
+  path = Rails.root + filename
+  FileUtils.mkdir_p File.dirname path
+  record path
 
-  File.open(filepath, 'w+'){|f| f << contents }
+  File.open(path,'w+'){ |f| f << contents }
 end
 
 Given /^I add "([^"]*)" to the "([^"]*)" model$/ do |code, model_name|
-  filename = File.join(Rails.root, "app", "models", "#{model_name}.rb")
-  ActiveAdminContentsRollback.record(filename)
-
-  # Update the file
-  contents = File.read(filename)
-  File.open(filename, "w+") do |f|
-    f << contents.gsub(/^(class .+)$/, "\\1\n  #{code}\n")
-  end
+  path = File.join Rails.root, "app", "models", "#{model_name}.rb"
+  record path
 
+  str = File.read(path).gsub /^(class .+)$/, "\\1\n  #{code}\n"
+  File.open(path, 'w+') { |f| f << str }
   ActiveSupport::Dependencies.clear
 end