form_builder_spec.rb in ransack-1.3.0

- old
+ new

@@ -33,111 +33,111 @@
 
       it 'selects previously-entered time values with datetime_select' do
         @s.created_at_eq = [2011, 1, 2, 3, 4, 5]
         html = @f.datetime_select(
           :created_at_eq,
-          use_month_numbers: true,
-          include_seconds: true
+          :use_month_numbers => true,
+          :include_seconds => true
           )
         %w(2011 1 2 03 04 05).each do |val|
-          html.should match /<option selected="selected" value="#{val}">#{val}<\/option>/
+          expect(html).to match /<option selected="selected" value="#{val}">#{val}<\/option>/
         end
       end
 
       describe '#label' do
 
         it 'localizes attribute names' do
           html = @f.label :name_cont
-          html.should match /Full Name contains/
+          expect(html).to match /Full Name contains/
         end
 
       end
 
       describe '#sort_link' do
         it 'sort_link for ransack attribute' do
-          sort_link = @f.sort_link :name, controller: 'people'
-          if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./ 
-            sort_link.should match /people\?q%5Bs%5D=name\+asc/
+          sort_link = @f.sort_link :name, :controller => 'people'
+          if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
+            expect(sort_link).to match /people\?q%5Bs%5D=name\+asc/
           else
-            sort_link.should match /people\?q(%5B|\[)s(%5D|\])=name\+asc/
+            expect(sort_link).to match /people\?q(%5B|\[)s(%5D|\])=name\+asc/
           end
-          sort_link.should match /sort_link/
-          sort_link.should match /Full Name<\/a>/
+          expect(sort_link).to match /sort_link/
+          expect(sort_link).to match /Full Name<\/a>/
         end
 
         it 'sort_link for common attribute' do
-          sort_link = @f.sort_link :id, controller: 'people'
-          sort_link.should match /id<\/a>/
+          sort_link = @f.sort_link :id, :controller => 'people'
+          expect(sort_link).to match /id<\/a>/
         end
       end
 
       describe '#submit' do
 
         it 'localizes :search when no default value given' do
           html = @f.submit
-          html.should match /"Search"/
+          expect(html).to match /"Search"/
         end
 
       end
 
       describe '#attribute_select' do
 
         it 'returns ransackable attributes' do
           html = @f.attribute_select
-          html.split(/\n/).
-            should have(Person.ransackable_attributes.size + 1).lines
+          expect(html.split(/\n/).size).
+            to eq(Person.ransackable_attributes.size + 1)
           Person.ransackable_attributes.each do |attribute|
-            html.should match /<option value="#{attribute}">/
+            expect(html).to match /<option value="#{attribute}">/
           end
         end
 
         it 'returns ransackable attributes for associations with :associations' do
           attributes = Person.ransackable_attributes + Article.
             ransackable_attributes.map { |a| "articles_#{a}" }
-          html = @f.attribute_select(associations: ['articles'])
-          html.split(/\n/).should have(attributes.size).lines
+          html = @f.attribute_select(:associations => ['articles'])
+          expect(html.split(/\n/).size).to eq(attributes.size)
           attributes.each do |attribute|
-            html.should match /<option value="#{attribute}">/
+            expect(html).to match /<option value="#{attribute}">/
           end
         end
 
         it 'returns option groups for base and associations with :associations' do
-          html = @f.attribute_select(associations: ['articles'])
+          html = @f.attribute_select(:associations => ['articles'])
           [Person, Article].each do |model|
-            html.should match /<optgroup label="#{model}">/
+            expect(html).to match /<optgroup label="#{model}">/
           end
         end
 
       end
 
       describe '#predicate_select' do
 
         it 'returns predicates with predicate_select' do
           html = @f.predicate_select
           Predicate.names.each do |key|
-            html.should match /<option value="#{key}">/
+            expect(html).to match /<option value="#{key}">/
           end
         end
 
         it 'filters predicates with single-value :only' do
-          html = @f.predicate_select only: 'eq'
+          html = @f.predicate_select :only => 'eq'
           Predicate.names.reject { |k| k =~ /^eq/ }.each do |key|
-            html.should_not match /<option value="#{key}">/
+            expect(html).not_to match /<option value="#{key}">/
           end
         end
 
         it 'filters predicates with multi-value :only' do
           html = @f.predicate_select only: [:eq, :lt]
           Predicate.names.reject { |k| k =~ /^(eq|lt)/ }.each do |key|
-            html.should_not match /<option value="#{key}">/
+            expect(html).not_to match /<option value="#{key}">/
           end
         end
 
         it 'excludes compounds when compounds: false' do
-          html = @f.predicate_select compounds: false
+          html = @f.predicate_select :compounds => false
           Predicate.names.select { |k| k =~ /_(any|all)$/ }.each do |key|
-            html.should_not match /<option value="#{key}">/
+            expect(html).not_to match /<option value="#{key}">/
           end
         end
       end
 
       context 'fields used in polymorphic relations as search attributes in form' do
@@ -146,14 +146,14 @@
             @f = f
           end
         end
         it 'accepts poly_id field' do
           html = @f.text_field(:notable_id_eq)
-          html.should match /id=\"q_notable_id_eq\"/
+          expect(html).to match /id=\"q_notable_id_eq\"/
         end
         it 'accepts poly_type field' do
           html = @f.text_field(:notable_type_eq)
-          html.should match /id=\"q_notable_type_eq\"/
+          expect(html).to match /id=\"q_notable_type_eq\"/
         end
       end
     end
   end
 end