activeadmin 0.6.6 → 1.0.0.pre1

data/features/step_definitions/configuration_steps.rb

@@ -4,7 +4,7 @@ module ActiveAdminReloading
     eval(config_content)
     ActiveAdmin::Event.dispatch ActiveAdmin::Application::AfterLoadEvent,  ActiveAdmin.application
     Rails.application.reload_routes!
-    ActiveAdmin.application.namespaces.values.each &:reset_menu!
+    ActiveAdmin.application.namespaces.each &:reset_menu!
   end
 end
 
@@ -58,7 +58,14 @@ Given /^a(?:n? (index|show))? configuration of:$/ do |action, config_content|
   case action
   when 'index'
     step 'I am logged in'
-    step 'I am on the index page for posts'
+    case resource = config_content.match(/ActiveAdmin\.register (\w+)/)[1]
+    when 'Post'
+      step 'I am on the index page for posts'
+    when 'Category'
+      step 'I am on the index page for categories'
+    else
+      raise "#{resource} is not supported"
+    end
   when 'show'
     case resource = config_content.match(/ActiveAdmin\.register (\w+)/)[1]
     when 'Post'

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)
+  expect(page).to 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)
+  expect(page).to_not have_css '.dashboard .panel h3', text: name
 end

data/features/step_definitions/factory_steps.rb

@@ -1,20 +1,21 @@
 def create_user(name, type = 'User')
-  type.camelize.constantize.
-    find_or_create_by_first_name_and_last_name *name.split(' '), :username => name.gsub(' ', '').underscore
+  first_name, last_name = name.split(' ')
+  user = type.camelize.constantize.where(first_name: first_name, last_name: last_name).first_or_create(username: name.tr(' ', '').underscore)
 end
 
-Given /^(a|\d+)( published)? posts?(?: with the title "([^"]*)")?(?: and body "([^"]*)")?(?: written by "([^"]*)")? exists?$/ do |count, published, title, body, user|
+Given /^(a|\d+)( published)? posts?(?: with the title "([^"]*)")?(?: and body "([^"]*)")?(?: written by "([^"]*)")?(?: in category "([^"]*)")? exists?$/ do |count, published, title, body, user, category_name|
   count     = count == 'a' ? 1 : count.to_i
   published = Time.now          if published
   author    = create_user(user) if user
+  category  = Category.where(name: category_name).first_or_create if category_name
   title   ||= "Hello World %i"
   count.times do |i|
-    Post.create! :title => title % i, :body => body, :author => author, :published_at => published
+    Post.create! title: title % i, body: body, author: author, published_at: published, custom_category_id: category.try(:id)
   end
 end
 
 Given /^a category named "([^"]*)" exists$/ do |name|
-  Category.create! :name => name
+  Category.create! name: name
 end
 
 Given /^a (user|publisher) named "([^"]*)" exists$/ do |type, name|
@@ -22,12 +23,12 @@ Given /^a (user|publisher) named "([^"]*)" exists$/ do |type, name|
 end
 
 Given /^a store named "([^"]*)" exists$/ do |name|
-  Store.create! :name => name
+  Store.create! name: name
 end
 
 Given /^I create a new post with the title "([^"]*)"$/ do |title|
-  click_link "Posts"
+  first(:link, 'Posts').click
   click_link "New Post"
-  fill_in :title, :with => title
+  fill_in 'post_title', with: title
   click_button "Create Post"
 end

data/features/step_definitions/filter_steps.rb

@@ -1,13 +1,13 @@
 Then /^I should see a select filter for "([^"]*)"$/ do |label|
-  page.should have_css(".filter_select label", :text => label)
+  expect(page).to have_css '.filter_select label', text: label
 end
 
 Then /^I should see a string filter for "([^"]*)"$/ do |label|
-  page.should have_css(".filter_string label", :text => label)
+  expect(page).to have_css '.filter_string label', text: label
 end
 
 Then /^I should see a date range filter for "([^"]*)"$/ do |label|
-  page.should have_css(".filter_date_range label", :text => label)
+  expect(page).to have_css '.filter_date_range label', text: label
 end
 
 Then /^I should see the following filters:$/ do |table|
@@ -15,3 +15,25 @@ Then /^I should see the following filters:$/ do |table|
     step %{I should see a #{type} filter for "#{label}"}
   end
 end
+
+Given(/^I add parameter "([^"]*)" with value "([^"]*)" to the URL$/) do |key, value|
+  url = page.current_url
+  separator = url.include?('?') ? '&' : '?'
+  visit url + separator + key.to_s + '=' + value.to_s
+end
+
+Then(/^I should( not)? have parameter "([^"]*)"( with value "([^"]*)")?$/) do |negative, key, compare_val, value|
+  query = URI(page.current_url).query
+  if query.nil?
+    expect(negative).to be_truthy
+  else
+    params = Rack::Utils.parse_query query
+    if compare_val
+      expect(params[key]).to_not eq value if negative
+      expect(params[key]).to eq value unless negative
+    else
+      expect(params[key]).to be_nil if negative
+      expect(params[key]).to be_present unless negative
+    end
+  end
+end

data/features/step_definitions/flash_steps.rb

@@ -1,11 +1,11 @@
 Then /^I should see a flash with "([^"]*)"$/ do |text|
-  page.should have_content(text)
+  expect(page).to have_content text
 end
 
 Then /^I should see a successful create flash$/ do
-  page.should have_css('div.flash_notice', :text => /was successfully created/)
+  expect(page).to have_css 'div.flash_notice', text: /was successfully created/
 end
 
 Then /^I should not see a successful create flash$/ do
-  page.should_not have_css('div.flash_notice', :text => /was successfully created/)
+  expect(page).to_not have_css 'div.flash_notice', text: /was successfully created/
 end

data/features/step_definitions/format_steps.rb

@@ -1,36 +1,32 @@
-CSVLib = if RUBY_VERSION =~ /^1.8/
-            require 'fastercsv'
-            FasterCSV
-          else
-            require 'csv'
-            CSV
-          end
+require 'csv'
 
 Then "I should see nicely formatted datetimes" do
-  page.body.should =~ /\w+ \d{1,2}, \d{4} \d{2}:\d{2}/
+  expect(page.body).to match /\w+ \d{1,2}, \d{4} \d{2}:\d{2}/
 end
 
 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)
+  method = negate ? :to_not : :to
+  expect(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|
-  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"}
+  body   = page.driver.response.body
+  content_type_header, content_disposition_header = %w[Content-Type Content-Disposition].map do |header_name|
+    page.response_headers[header_name]
+  end
+  expect(content_type_header).to eq 'text/csv; charset=utf-8'
+  expect(content_disposition_header).to match /\Aattachment; filename=".+?\.csv"\z/
 
   begin
-    csv = CSVLib.parse(body, :col_sep => sep)
+    csv = CSV.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)
         if expected_cell.blank?
-          cell.should be_nil
+          expect(cell).to be_nil
         else
-          (cell || '').should match /#{expected_cell}/
+          expect(cell || '').to match /#{expected_cell}/
         end
       end
     end
@@ -48,5 +44,9 @@ Then /^I should download a CSV file for "([^"]*)" containing:$/ do |resource_nam
 end
 
 Then /^the CSV file should contain "([^"]*)" in quotes$/ do |text|
-  page.driver.response.body.should match /"#{text}"/
+  expect(page.driver.response.body).to match /"#{text}"/
+end
+
+Then /^the encoding of the CSV file should be "([^"]*)"$/ do |text|
+  expect(page.driver.response.body.encoding).to be Encoding.find(Encoding.aliases[text] || text)
 end

data/features/step_definitions/index_scope_steps.rb

@@ -6,16 +6,16 @@ end
 
 Then /^I should see the scope "([^"]*)" not selected$/ do |name|
   step %{I should see the scope "#{name}"}
-  page.should_not have_css('.scopes .selected', :text => name)
+  expect(page).to_not have_css '.scopes .selected', text: name
 end
 
 Then /^I should see the scope "([^"]*)" with the count (\d+)$/ do |name, count|
-  name = name.gsub(' ','').underscore.downcase
+  name = name.tr(' ','').underscore.downcase
   step %{I should see "#{count}" within ".scopes .#{name} .count"}
 end
 
 Then /^I should see the scope "([^"]*)" with no count$/ do |name|
-  name = name.gsub(" ", "").underscore.downcase
-  page.should     have_css(".scopes .#{name}")
-  page.should_not have_css(".scopes .#{name} .count")
+  name = name.tr(" ", "").underscore.downcase
+  expect(page).to     have_css ".scopes .#{name}"
+  expect(page).to_not have_css ".scopes .#{name} .count"
 end

data/features/step_definitions/layout_steps.rb

@@ -1,3 +1,3 @@
 Then /^I should see the Active Admin layout$/ do
-  page.should have_css("#active_admin_content #main_content_wrapper")
+  expect(page).to have_css '#active_admin_content #main_content_wrapper'
 end

data/features/step_definitions/member_link_steps.rb

@@ -1,7 +1,7 @@
 Then /^I should see an action item button "([^"]*)"$/ do |content|
-  page.should have_css(".action_items a", :text => content)
+  expect(page).to have_css '.action_items a', text: content
 end
 
 Then /^I should not see an action item button "([^"]*)"$/ do |content|
-  page.should_not have_css(".action_items", :text => content)
+  expect(page).to_not have_css '.action_items', text: content
 end

data/features/step_definitions/menu_steps.rb

@@ -1,11 +1,11 @@
 Then /^I should see a menu item for "([^"]*)"$/ do |name|
-  page.should have_css('#tabs li a', :text => name)
+  expect(page).to have_css '#tabs li a', text: name
 end
 
 Then /^I should not see a menu item for "([^"]*)"$/ do |name|
-  page.should_not have_css('#tabs li a', :text => name)
+  expect(page).to_not have_css '#tabs li a', text: name
 end
 
 Then /^I should see a nested menu item for "([^"]*)"$/ do |name|
-  page.should have_css('#tabs > li > ul > li > a', :text => name)
+  expect(page).to have_css '#tabs > li > ul > li > a', text: name
 end

data/features/step_definitions/pagination_steps.rb

@@ -1,8 +1,7 @@
 Then /^I should not see pagination$/ do
-  page.should_not have_css(".pagination")
+  expect(page).to_not have_css '.pagination'
 end
 
 Then /^I should see pagination with (\d+) pages$/ do |count|
-  step %{I should see "#{count}" within ".pagination a"}
-  step %{I should not see "#{count.to_i + 1}" within ".pagination a"}
+  expect(page).to have_css '.pagination span.page', count: count
 end

data/features/step_definitions/sidebar_steps.rb

@@ -1,8 +1,13 @@
 Then /^I should see a sidebar titled "([^"]*)"$/ do |title|
-  page.should have_css(".sidebar_section h3", :text => title)
+  expect(page).to have_css '.sidebar_section h3', text: title
 end
 
 Then /^I should not see a sidebar titled "([^"]*)"$/ do |title|
-  title = title.gsub(' ', '').underscore
-  page.all(:css, "##{title}_sidebar_section").count.should == 0
+  title = title.tr(' ', '').underscore
+  sidebars = page.all :css, "##{title}_sidebar_section"
+  expect(sidebars.count).to eq 0
+end
+
+Then(/^I should see a sidebar titled "(.*?)" above sidebar titled "(.*?)"$/) do |top_title, bottom_title|
+  expect(page).to have_css %Q(.sidebar_section:contains('#{top_title}') + .sidebar_section:contains('#{bottom_title}'))
 end

data/features/step_definitions/site_title_steps.rb

@@ -1,15 +1,17 @@
 Then /^I should see the site title "([^"]*)"$/ do |title|
-  page.should have_css('h1#site_title', :text => title)
+  expect(page).to have_css 'h1#site_title', text: title
 end
 
 Then /^I should not see the site title "([^"]*)"$/ do |title|
-  page.should_not have_css('h1#site_title', :text => title)
+  expect(page).to_not have_css 'h1#site_title', text: title
 end
 
 Then /^I should see the site title image "([^"]*)"$/ do |image|
-  page.should have_css('h1#site_title img', :src => image)
+  img = page.find('h1#site_title img')
+  expect(img[:src]).to eq(image)
 end
 
 Then /^I should see the site title image linked to "([^"]*)"$/ do |url|
-  page.should have_css('h1#site_title a', :href => url)
+  link = page.find('h1#site_title a')
+  expect(link[:href]).to eq(url)
 end

data/features/step_definitions/symbol_leak_steps.rb

@@ -0,0 +1,3 @@
+Then /^"(.*?)" shouldn't be a symbol$/ do |sym|
+  expect(Symbol.all_symbols.map &:to_s).to_not include(sym), 'symbol detected!'
+end

data/features/step_definitions/tab_steps.rb

@@ -1,3 +1,8 @@
 Then /^the "([^"]*)" tab should be selected$/ do |name|
   step %{I should see "#{name}" within "ul#tabs li.current"}
 end
+
+Then(/^I should see two tabs "(.*?)" and "(.*?)"$/) do |tab_1, tab_2|
+  expect(page).to have_link(tab_1)
+  expect(page).to have_link(tab_2)
+end

data/features/step_definitions/table_steps.rb

@@ -1,5 +1,5 @@
 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
+  expect(all("table.index_table tr > td:first").count).to eq count.to_i
 end
 
 # TODO: simplify this, if possible?
@@ -91,9 +91,9 @@ module TableMatchHelper
 
   def assert_cells_match(cell, expected_cell)
     if expected_cell =~ /^\/.*\/$/
-      cell.should match(Regexp.new(expected_cell[1..-2]))
+      expect(cell).to match /#{expected_cell[1..-2]}/
     else
-      (cell || "").strip.should == expected_cell
+      expect((cell || "").strip).to eq expected_cell
     end
   end
 
@@ -110,7 +110,7 @@ World(TableMatchHelper)
 #     |    /\d+/     | 12/02/12 |       $25.00 |
 #
 Then /^I should see the "([^"]*)" table:$/ do |table_id, expected_table|
-  page.should have_css("table##{table_id}")
+  expect(page).to have_css "table##{table_id}"
 
   assert_tables_match(
     HtmlTableToTextHelper.new(page.body, "table##{table_id}").to_array,

data/features/step_definitions/user_steps.rb

@@ -1,6 +1,5 @@
 def ensure_user_created(email)
-  user = AdminUser.find_or_create_by_email :email => email,
-         :password => 'password', :password_confirmation => 'password'
+  user = AdminUser.where(email: email).first_or_create(password: 'password', password_confirmation: 'password')
 
   unless user.persisted?
     raise "Could not create user #{email}: #{user.errors.full_messages}"
@@ -9,7 +8,7 @@ def ensure_user_created(email)
 end
 
 Given /^(?:I am logged|log) out$/ do
-  click_link 'Logout' if page.all(:css, "a", :text => 'Logout').any?
+  click_link 'Logout' if page.all(:css, "a", text: 'Logout').any?
 end
 
 Given /^I am logged in$/ do
@@ -23,8 +22,8 @@ Given /^I am logged in with capybara$/ do
   step 'log out'
 
   visit new_admin_user_session_path
-  fill_in 'Email',    :with => 'admin@example.com'
-  fill_in 'Password', :with => 'password'
+  fill_in 'Email',    with: 'admin@example.com'
+  fill_in 'Password', with: 'password'
   click_button 'Login'
 end
 
@@ -32,11 +31,15 @@ Given /^an admin user "([^"]*)" exists$/ do |email|
   ensure_user_created(email)
 end
 
-Given /^"([^"]*)" requests a pasword reset with token "([^"]*)"( but it expires)?$/ do |email, token, expired|
+Given /^"([^"]*)" requests a password reset with token "([^"]*)"( but it expires)?$/ do |email, token, expired|
   visit new_admin_user_password_path
   fill_in 'Email', with: email
-  Devise.stub(:friendly_token){ token }
+  allow(Devise).to receive(:friendly_token).and_return(token)
   click_button "Reset My Password"
 
   AdminUser.where(email: email).first.update_attribute :reset_password_sent_at, 1.month.ago if expired
 end
+
+When /^I fill in the password field with "([^"]*)"$/ do |password|
+  fill_in 'admin_user_password', with: password
+end

data/features/step_definitions/web_steps.rb

@@ -27,20 +27,24 @@ When /^(?:I )go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
+When /^(?:I )POST to "(.*?)" with params "(.*?)"$/ do |url, params|
+  post "#{url}#{params}"
+end
+
 When /^(?:I )press "([^"]*)"$/ do |button|
   click_button(button)
 end
 
 When /^(?:I )follow "([^"]*)"$/ do |link|
-  click_link(link)
+  first(:link, link).click
 end
 
 When /^(?:I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 When /^(?:I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select(value, :from => field)
+  select(value, from: field)
 end
 
 When /^(?:I )(check|uncheck|choose) "([^"]*)"$/ do |action, field|
@@ -52,29 +56,28 @@ When /^(?:I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
 end
 
 Then /^(?:I )should( not)? see( the element)? "([^"]*)"$/ do |negate, is_css, text|
-  should = negate ? :should_not    : :should
+  should = negate ? :not_to        : :to
   have   = is_css ? have_css(text) : have_content(text)
-  page.send should, have
+  expect(page).send should, have
 end
 
 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
-    negate ? field_value.should_not =~ /#{value}/ : field_value.should =~ /#{value}/
+    value = field.tag_name == 'textarea' ? field.text : field.value
+
+    expect(value).send negate ? :not_to : :to, match(/#{value}/)
   end
 end
 
 Then /^the "([^"]*)" checkbox(?: within (.*))? should( not)? be checked$/ do |label, parent, negate|
   with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    field_checked.should negate ? be_false : be_true
+    expect(find_field(label)['checked']).to negate ? eq(false) : eq(true)
   end
 end
 
 Then /^(?:|I )should be on (.+)$/ do |page_name|
-  current_path = URI.parse(current_url).path
-  current_path.should == path_to(page_name)
+  expect(URI.parse(current_url).path).to eq path_to page_name
 end
 
 Then /^show me the page$/ do