From 7657d02003fb6967d40c11f5b0fb3d1d418f778a Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Mar 08 2019 19:24:05 +0000 Subject: Replace factory_girl by factory_bot to fix FTBFS (rhbz#1675913). --- diff --git a/rubygem-cucumber-rails.spec b/rubygem-cucumber-rails.spec index 2bfb2a0..c18c3bb 100644 --- a/rubygem-cucumber-rails.spec +++ b/rubygem-cucumber-rails.spec @@ -26,7 +26,7 @@ BuildRequires: %{_bindir}/cucumber BuildRequires: rubygem(bundler) BuildRequires: rubygem(aruba) BuildRequires: rubygem(database_cleaner) -BuildRequires: rubygem(factory_girl) +BuildRequires: rubygem(factory_bot) # Test app dependencies. BuildRequires: %{_bindir}/node @@ -114,6 +114,10 @@ bundle exec rspec -raction_controller/railtie spec # Do not download anything, use locally installed packages. sed -i "s/'bundle install'/'bundle install --local'/" features/step_definitions/cucumber_rails_steps.rb +# We have now rubygem-factory_bot instead of rubygem-factory_girl. +sed -i "s/factory_girl/factory_bot/g" features/step_definitions/cucumber_rails_steps.rb +sed -i "s/FactoryGirl/FactoryBot/g" features/emulate_javascript.feature + # We don't have chromedriver-helper in Fedora. sed -i "/run_simple 'bundle install --local'/i\\ overwrite_file('Gemfile', File.read(expand_path('Gemfile')).gsub!(/gem 'chromedriver-helper'/, '#\\\0'))" features/step_definitions/cucumber_rails_steps.rb @@ -126,7 +130,7 @@ sed -i '/^ Scenario: Use a particular driver$/i\ @firefox' features/capybara_j sed -i '/^ Scenario: Mixed DB access$/i\ @firefox' features/capybara_javascript_drivers.feature sed -i '/^ Scenario: See a widget$/i\ @firefox' features/emulate_javascript.feature -cucumber --tags ~@firefox +cucumber --tags 'not @firefox' %endif popd @@ -155,6 +159,9 @@ popd %{gem_instdir}/spec %changelog +* Fri Mar 08 2019 Vít Ondruch - 1.5.0-5 +- Replace factory_girl by factory_bot to fix FTBFS (rhbz#1675913). + * Sat Feb 02 2019 Fedora Release Engineering - 1.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild