yousty-activeadmin 1.0.4.pre → 1.0.5.pre

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

@@ -1,3 +1,3 @@
 Then /^"(.*?)" shouldn't be a symbol$/ do |sym|
-  Symbol.all_symbols.map(&:to_s).should_not include(sym), 'symbol detected!'
+  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,5 +1,5 @@
 def ensure_user_created(email)
-  user = AdminUser.where(:email => email).first_or_create(: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}"
@@ -8,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
@@ -22,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
 
@@ -31,9 +31,15 @@ Given /^an admin user "([^"]*)" exists$/ do |email|
   ensure_user_created(email)
 end
 
-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
+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
+  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

@@ -36,15 +36,15 @@ When /^(?:I )press "([^"]*)"$/ do |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|
@@ -56,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

data/features/sti_resource.feature

@@ -7,18 +7,10 @@ Feature: STI Resource
     And a configuration of:
     """
       ActiveAdmin.register Publisher do
-        controller do
-          def permitted_params
-            params.permit publisher: [:first_name, :last_name, :username, :age]
-          end if Rails::VERSION::MAJOR == 4
-        end
+        permit_params :first_name, :last_name, :username, :age if Rails::VERSION::MAJOR == 4
       end
       ActiveAdmin.register User do
-        controller do
-          def permitted_params
-            params.permit user: [:first_name, :last_name, :username, :age]
-          end if Rails::VERSION::MAJOR == 4
-        end
+        permit_params :first_name, :last_name, :username, :age if Rails::VERSION::MAJOR == 4
       end
     """
 

data/features/strong_parameters.feature

@@ -0,0 +1,73 @@
+@rails4
+@silent_unpermitted_params_failure
+Feature: Strong Params
+
+  When I am using Rails 4
+  I want to use Strong Parameters
+
+  Background:
+    Given a category named "Music" exists
+    And a user named "John Doe" exists
+    And a post with the title "Hello World" written by "John Doe" exists
+    And I am logged in
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+      end
+    """
+    When I am on the index page for posts
+
+  Scenario: Static permitted parameters
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        permit_params :author, :title, :starred
+      end
+    """
+    Given I follow "Edit"
+
+    When I fill in "Title" with "Hello World from update"
+    And I check "Starred"
+    When I press "Update Post"
+    Then I should see "Post was successfully updated."
+    And I should see the attribute "Title" with "Hello World from update"
+    And I should see the attribute "Author" with "John Doe"
+    And I should see the attribute "Starred" with "true"
+
+  Scenario: Dynamic permitted parameters
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        permit_params do
+          allow = [:author, :title]
+          allow << :starred
+          allow
+        end
+      end
+    """
+    Given I follow "Edit"
+
+    When I fill in "Title" with "Hello World from update"
+    And I check "Starred"
+    When I press "Update Post"
+    Then I should see "Post was successfully updated."
+    And I should see the attribute "Title" with "Hello World from update"
+    And I should see the attribute "Author" with "John Doe"
+    And I should see the attribute "Starred" with "true"
+
+  Scenario: Should not update parameters that are not declared as permitted
+    Given a configuration of:
+    """
+      ActiveAdmin.register Post do
+        permit_params :author, :title
+      end
+    """
+    Given I follow "Edit"
+
+    When I fill in "Title" with "Hello World from update"
+    And I check "Starred"
+    When I press "Update Post"
+    Then I should see "Post was successfully updated."
+    And I should see the attribute "Title" with "Hello World from update"
+    And I should see the attribute "Author" with "John Doe"
+    And the attribute "Starred" should be empty

data/features/support/env.rb

@@ -6,7 +6,7 @@
 
 ENV["RAILS_ENV"] ||= "cucumber"
 
-require File.expand_path('../../../spec/spec_helper_without_rails', __FILE__)
+require File.expand_path('../../../spec/spec_helper', __FILE__)
 
 ENV['RAILS_ROOT'] = File.expand_path("../../../spec/rails/rails-#{ENV["RAILS"]}", __FILE__)
 
@@ -15,9 +15,10 @@ unless File.exists?(ENV['RAILS_ROOT'])
   system 'rake setup'
 end
 
-# Ensure the Active Admin load path is happy
 require 'rails'
+require 'active_record'
 require 'active_admin'
+require 'devise'
 ActiveAdmin.application.load_paths = [ENV['RAILS_ROOT'] + "/app/admin"]
 
 require ENV['RAILS_ROOT'] + '/config/environment'
@@ -28,9 +29,29 @@ autoload :ActiveAdmin, 'active_admin'
 
 require 'cucumber/rails'
 
+require 'rspec/mocks'
+World(RSpec::Mocks::ExampleMethods)
+
+Before do
+  RSpec::Mocks.setup
+end
+
+After do
+  begin
+    RSpec::Mocks.verify
+  ensure
+    RSpec::Mocks.teardown
+  end
+end
+
 require 'capybara/rails'
 require 'capybara/cucumber'
 require 'capybara/session'
+require 'capybara/poltergeist'
+require 'phantomjs/poltergeist'
+
+Capybara.javascript_driver = :poltergeist
+
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your
@@ -110,3 +131,15 @@ unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'
   Before { DeferredGarbageCollection.start }
   After  { DeferredGarbageCollection.reconsider }
 end
+
+# Don't run @rails4 tagged features for versions before Rails 4.
+Before('@rails4') do |scenario|
+  scenario.skip_invoke! if Rails::VERSION::MAJOR < 4
+end
+
+Around '@silent_unpermitted_params_failure' do |scenario, block|
+  original = ActionController::Parameters.action_on_unpermitted_parameters
+  ActionController::Parameters.action_on_unpermitted_parameters = false
+  block.call
+  ActionController::Parameters.action_on_unpermitted_parameters = original
+end

data/features/support/paths.rb

@@ -23,7 +23,7 @@ module NavigationHelpers
       "/admin/posts/1"
     when /the first post edit page/
       "/admin/posts/1/edit"
-    when /the admin password reset form with reset password token "([^"]*)"/
+    when /the admin password reset form with token "([^"]*)"/
       "/admin/password/edit?reset_password_token=#{$1}"
 
     # the index page for posts in the root namespace
@@ -43,7 +43,7 @@ module NavigationHelpers
       admin_user_posts_path(User.last)
 
     when /^the last author's last post page$/
-      admin_user_post_path(User.last, Post.where(:author_id => User.last.id).last)
+      admin_user_post_path(User.last, Post.where(author_id: User.last.id).last)
 
     when /^the last post's edit page$/
       edit_admin_post_path(Post.last)

data/features/support/selectors.rb

@@ -27,7 +27,7 @@ module HtmlSelectorsHelpers
       [:css, "table.index_grid"]
 
     when /^the "([^"]*)" sidebar$/
-      [:css, "##{$1.gsub(" ", '').underscore}_sidebar_section"]
+      [:css, "##{$1.tr(" ", '').underscore}_sidebar_section"]
 
     # This allows you to provide a quoted selector as the scope
     # for "within" steps as was previously the default for the