yousty-activeadmin 1.0.4.pre → 1.0.5.pre

data/features/sidebar_sections.feature

@@ -196,3 +196,15 @@ Feature: Sidebar Sections
     When I am on the index page for posts
     Then I should see "Hello World from a custom partial" within the "Help" sidebar
 
+
+  Scenario: Position sidebar at the top using priority option
+    Given a configuration of:
+    """
+    ActiveAdmin.register Post do
+      sidebar :help, priority: 0 do
+        "Need help? Email us at help@example.com"
+      end
+    end
+    """
+    When I am on the index page for posts
+    Then I should see a sidebar titled "Help" above sidebar titled "Filters"

data/features/specifying_actions.feature

@@ -23,7 +23,7 @@ Feature: Specifying Actions
     Given a configuration of:
       """
         ActiveAdmin.register Post do
-          action_item(:only => :index) do
+          action_item(:import, :only => :index) do
             link_to('Import Posts', import_admin_posts_path)
           end
 
@@ -43,7 +43,7 @@ Feature: Specifying Actions
     Given a configuration of:
       """
         ActiveAdmin.register Post do
-          action_item(:only => :show) do
+          action_item(:review, :only => :show) do
             link_to('Review', review_admin_post_path)
           end
 
@@ -69,7 +69,7 @@ Feature: Specifying Actions
     Given a configuration of:
       """
         ActiveAdmin.register Post do
-          action_item(:only => :show) do
+          action_item(:review, :only => :show) do
             link_to('Review', review_admin_post_path)
           end
 

data/features/step_definitions/action_item_steps.rb

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

data/features/step_definitions/action_link_steps.rb

@@ -1,7 +1,20 @@
 Then /^I should see a member link to "([^"]*)"$/ do |name|
-  page.should have_css("a.member_link", :text => name)
+  expect(page).to have_css('a.member_link', text: name)
 end
 
 Then /^I should not see a member link to "([^"]*)"$/ do |name|
   %{Then I should not see "#{name}" within "a.member_link"}
 end
+
+Then /^I should see the actions column with the class "([^"]*)" and the title "([^"]*)"$/ do |klass, title|
+  expect(page).to have_css "th#{'.'+klass}", text: title
+end
+
+Then /^I should see a dropdown menu item to "([^"]*)"$/ do |name|
+  expect(page).to have_css('ul.dropdown_menu_list li a', text: name)
+end
+
+Then /^I should not see a dropdown menu item to "([^"]*)"$/ do |name|
+  %{Then I should not see "#{name}" within "ul.dropdown_menu_list li a"}
+end
+

data/features/step_definitions/additional_web_steps.rb

@@ -1,17 +1,17 @@
 Then /^I should see a table header with "([^"]*)"$/ do |content|
-  page.should have_xpath('//th', :text => content)
+  expect(page).to have_xpath '//th', text: content
 end
 
 Then /^I should not see a table header with "([^"]*)"$/ do |content|
-  page.should_not have_xpath('//th', :text => content)
+  expect(page).to_not have_xpath '//th', text: content
 end
 
 Then /^I should see a sortable table header with "([^"]*)"$/ do |content|
-  page.should have_css('th.sortable', :text => content)
+  expect(page).to have_css 'th.sortable', text: content
 end
 
 Then /^I should not see a sortable table header with "([^"]*)"$/ do |content|
-  page.should_not have_css('th.sortable', :text => content)
+  expect(page).to_not have_css 'th.sortable', text: content
 end
 
 Then /^I should not see a sortable table header$/ do
@@ -19,22 +19,21 @@ Then /^I should not see a sortable table header$/ do
 end
 
 Then /^the table "([^"]*)" should have (\d+) rows/ do |selector, count|
-  table = page.find(selector)
-  table.all(:css, 'tr').size.should == count.to_i
+  trs = page.find(selector).all :css, 'tr'
+  expect(trs.size).to eq count.to_i
 end
 
 Then /^the table "([^"]*)" should have (\d+) columns/ do |selector, count|
-  table = page.find(selector)
-  row = table.find('tr:first')
-  row.all(:css, "td").size.should == count.to_i
+  tds = page.find(selector).find('tr:first').all :css, 'td'
+  expect(tds.size).to eq count.to_i
 end
 
 Then /^there should be (\d+) "([^"]*)" tags$/ do |count, tag|
-  page.all(:css, tag).size.should == count.to_i
+  expect(page.all(:css, tag).size).to eq count.to_i
 end
 
 Then /^I should see a link to "([^"]*)"$/ do |link|
-  page.should have_xpath('//a', :text => link)
+  expect(page).to have_xpath '//a', text: link
 end
 
 Then /^an "([^"]*)" exception should be raised when I follow "([^"]*)"$/ do |error, link|
@@ -44,7 +43,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
+  expect(current_url).to include resource_name.tr(' ', '').underscore.pluralize
 end
 
 Then /^I should wait and see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
@@ -56,27 +55,27 @@ end
 
 Then /^I should see the page title "([^"]*)"$/ do |title|
   within('h2#page_title') do
-    page.should have_content(title)
+    expect(page).to have_content title
   end
 end
 
 Then /^I should see a fieldset titled "([^"]*)"$/ do |title|
-  page.should have_css('fieldset legend', :text => title)
+  expect(page).to have_css 'fieldset legend', text: title
 end
 
 Then /^the "([^"]*)" field should contain the option "([^"]*)"$/ do |field, option|
   field = find_field(field)
-  field.should have_css("option", :text => option)
+  expect(field).to have_css 'option', text: option
 end
 
 Then /^I should see the content "([^"]*)"$/ do |content|
-  page.should have_css("#active_admin_content", :text => content)
+  expect(page).to have_css '#active_admin_content', text: content
 end
 
 Then /^I should see a validation error "([^"]*)"$/ do |error_message|
-  page.should have_css(".inline-errors", :text => error_message)
+  expect(page).to have_css '.inline-errors', text: error_message
 end
 
 Then /^I should see a table with id "([^"]*)"$/ do |dom_id|
-  page.should have_css('table', :id => dom_id)
+  page.find("table##{dom_id}")
 end

data/features/step_definitions/asset_steps.rb

@@ -3,13 +3,13 @@ Then /^I should see the css file "([^"]*)"$/ do |path|
 end
 
 Then /^I should see the css file "([^"]*)" of media "([^"]*)"$/ do |path, media|
-  page.should have_xpath("//link[contains(@href, /stylesheets/#{path}) and contains(@media, #{media})]")
+  expect(page).to have_xpath("//link[contains(@href, /stylesheets/#{path}) and contains(@media, #{media})]", visible: false)
 end
 
 Then /^I should see the js file "([^"]*)"$/ do |path|
-  page.should have_xpath("//script[contains(@src, /javascripts/#{path})]")
+  expect(page).to have_xpath("//script[contains(@src, /javascripts/#{path})]", visible: false)
 end
 
 Then /^I should see the favicon "([^"]*)"$/ do |path|
-  page.should have_xpath("//link[contains(@href, \"#{path}\")]")
+  expect(page).to have_xpath("//link[contains(@href, path)]", visible: false)
 end

data/features/step_definitions/attribute_steps.rb

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

data/features/step_definitions/batch_action_steps.rb

@@ -1,17 +1,22 @@
 Then /^I (should|should not) be asked to confirm "([^"]*)" for "([^"]*)"$/ do |maybe, confirmation, title|
   selector = "#batch_actions_popover a.batch_action:contains('#{title}')"
   selector << "[data-confirm='#{confirmation}']" if maybe == 'should'
-  page.send maybe.sub(' ', '_'), have_css(selector)
+
+  verb = maybe == 'should' ? :to : :to_not
+  expect(page).send verb, have_css(selector)
 end
 
 Then /^I (should|should not) see the batch action :([^\s]*) "([^"]*)"$/ do |maybe, sym, title|
-  selector = "#batch_actions_selector a.batch_action:contains('#{title}')"
+  selector = ".batch_actions_selector a.batch_action:contains('#{title}')"
   selector << "[href='#'][data-action='#{sym}']" if maybe == 'should'
-  page.send maybe.sub(' ', '_'), have_css(selector)
+
+  verb = maybe == 'should' ? :to : :to_not
+  expect(page).send verb, have_css(selector)
 end
 
 Then /^the (\d+)(?:st|nd|rd|th) batch action should be "([^"]*)"$/ do |index, title|
-  page.all("#batch_actions_selector a.batch_action")[index.to_i - 1].text.should match title
+  batch_action = page.all('.batch_actions_selector a.batch_action')[index.to_i - 1]
+  expect(batch_action.text).to match title
 end
 
 When /^I check the (\d+)(?:st|nd|rd|th) record$/ do |index|
@@ -23,17 +28,19 @@ When /^I toggle the collection selection$/ do
 end
 
 Then /^I should see that the batch action button is disabled$/ do
-  page.should have_css "#batch_actions_selector .dropdown_menu_button.disabled"
+  expect(page).to have_css ".batch_actions_selector .dropdown_menu_button.disabled"
 end
 
 Then /^I (should|should not) see the batch action (button|selector)$/ do |maybe, type|
-  selector = "div.table_tools #batch_actions_selector"
+  selector = "div.table_tools .batch_actions_selector"
   selector << ' .dropdown_menu_button' if maybe == 'should' && type == 'button'
-  page.send maybe.sub(' ', '_'), have_css(selector)
+
+  verb = maybe == 'should' ? :to : :to_not
+  expect(page).send verb, have_css(selector)
 end
 
 Then /^I should see the batch action popover exists$/ do
-  page.should have_css "#batch_actions_selector"
+  expect(page).to have_css '.batch_actions_selector'
 end
 
 Given /^I submit the batch action form with "([^"]*)"$/ do |action|
@@ -51,5 +58,15 @@ Given /^I submit the batch action form with "([^"]*)"$/ do |action|
 end
 
 Then /^I should not see checkboxes in the table$/ do
-  page.should_not have_css ".paginated_collection table input[type=checkbox]"
+  expect(page).to_not have_css '.paginated_collection table input[type=checkbox]'
+end
+
+Then /^I should be show a input with name "([^"]*)" and type "([^"]*)"$/ do |name, type|
+  selector = ".batch_actions_selector a.batch_action:first"
+  expect(page.find(selector)["data-inputs"]).to eq "{\"#{name}\":\"#{type}\"}"
+end
+
+Then /^I should be show a select with name "([^"]*)" with the values "([^"]*)"$/ do |name, values|
+  selector = ".batch_actions_selector a.batch_action:first"
+  expect(JSON[page.find(selector)["data-inputs"]]).to eq Hash[name, values.split(', ')]
 end

data/features/step_definitions/blog_steps.rb

@@ -0,0 +1,3 @@
+Then /^I should see a blog header "([^"]*)"$/ do |header_text|
+  expect(page).to have_css 'h3', text: header_text
+end

data/features/step_definitions/breadcrumb_steps.rb

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

data/features/step_definitions/comment_steps.rb

@@ -8,5 +8,5 @@ When /^I add a comment "([^"]*)"$/ do |comment|
 end
 
 Given /^a tag with the name "([^"]*)" exists$/ do |tag_name|
-  Tag.create(:name => tag_name)
+  Tag.create(name: tag_name)
 end

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
 

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,6 +1,6 @@
 def create_user(name, type = 'User')
   first_name, last_name = name.split(' ')
-  user = type.camelize.constantize.where(:first_name => first_name, :last_name => last_name).first_or_create(:username => name.gsub(' ', '').underscore)
+  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 "([^"]*)")?(?: in category "([^"]*)")? exists?$/ do |count, published, title, body, user, category_name|
@@ -10,12 +10,12 @@ Given /^(a|\d+)( published)? posts?(?: with the title "([^"]*)")?(?: and body "(
   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, category_id: category.try(:id)
+    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|
@@ -23,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,29 +1,32 @@
 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'
+  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 = CSV.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
@@ -41,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