express_admin 1.4.10 → 1.4.11

data/vendor/gems/express_templates/lib/express_templates/components/forms/radio.rb

@@ -17,7 +17,7 @@ module ExpressTemplates
         }
 
         def use_options_from_collection_radio_buttons_helper
-          collection_radio_buttons(resource_var, field_name.to_sym, collection_from_association,
+          collection_radio_buttons(resource_name, field_name.to_sym, collection_from_association,
                                    option_value_method, option_name_method,
                                    input_attributes) do |b|
             b.label(class: "radio") {
@@ -39,14 +39,14 @@ module ExpressTemplates
           when option_collection.kind_of?(Array)
             option_collection.each_with_index do |option, index|
               label(class: config[:label_wrapper_class]) {
-                radio_button(resource_var, field_name.to_sym, option, class: 'radio')
+                radio_button(resource_name, field_name.to_sym, option, class: 'radio')
                 current_arbre_element.add_child option
               }
             end
           when option_collection.kind_of?(Hash)
             option_collection.each_pair do |key, value|
               label(class: config[:label_wrapper_class]) {
-                radio_button(resource_var, field_name.to_sym, key, class: 'radio')
+                radio_button(resource_name, field_name.to_sym, key, class: 'radio')
                 current_arbre_element.add_child  value
               }
             end

data/vendor/gems/express_templates/lib/express_templates/components.rb

@@ -8,3 +8,4 @@ require 'express_templates/components/configurable'
 require 'express_templates/components/container'
 require 'express_templates/components/tree_for'
 require 'express_templates/components/forms'
+require 'express_templates/components/all'

data/vendor/gems/express_templates/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.9.8"
+  VERSION = "0.10.0"
 end

data/vendor/gems/express_templates/test/components/forms/basic_fields_test.rb

@@ -8,7 +8,15 @@ class BasicFieldsTest < ActiveSupport::TestCase
                     search telephone time url week)
 
   def assigns
-    {resource: resource}
+    {foo: resource}
+  end
+
+  def helpers
+    mock_action_view do
+      def foos_path
+        '/foos'
+      end
+    end
   end
 
   def field_type_map
@@ -67,7 +75,7 @@ class BasicFieldsTest < ActiveSupport::TestCase
       }
     }
     assert_match label_html, html
-    assert_match /<textarea rows="5" class="tinymce form-field" name="foo\[bar\]" id="foo_bar"><\/textarea>/, html.gsub("\n", '') 
+    assert_match /<textarea name="foo\[bar\]" id="foo_bar" rows="5" class="tinymce form-field"><\/textarea>/, html.gsub("\n", '')
   end
 
   test "hidden uses rails hidden_tag helper" do
@@ -87,7 +95,7 @@ class BasicFieldsTest < ActiveSupport::TestCase
       }
     }
     assert_no_match label_html, html
-    assert_match /<input class="hidden form-field" value="ninja" type="hidden" name="foo\[bar\]" id="foo_bar"/, html
+    assert_match /<input type="hidden" name="foo\[bar\]" id="foo_bar" value="ninja" class="hidden form-field"/, html
   end
 
   def resource_with_errors
@@ -113,37 +121,37 @@ class BasicFieldsTest < ActiveSupport::TestCase
   end
 
   test "adds error class if there are errors on a field with no input attributes" do
-    html_with_error = arbre(resource: resource_with_errors) {
+    html_with_error = arbre(foo: resource_with_errors) {
       express_form(:foo) {
        text :name
        text :body
       }
     }
     assert resource_with_errors.errors.any?
-    assert assigns[:resource].errors.any?
+    assert assigns[:foo].errors.any?
     assert has_error_class_on(:name, html_with_error), "name field has no error when expected"
     refute has_error_class_on(:body, html_with_error), "body field has error class when it should not"
   end
 
     test "adds error class if there are errors on a field with no class set" do
-    html_with_error = arbre(resource: resource_with_errors) {
+    html_with_error = arbre(foo: resource_with_errors) {
       express_form(:foo) {
        text :name, value: 'ninja'
       }
     }
     assert resource_with_errors.errors.any?
-    assert assigns[:resource].errors.any?
+    assert assigns[:foo].errors.any?
     assert_match has_error_class, html_with_error
   end
 
     test "adds error to class if there are errors on a field with existing class" do
-    html_with_error = arbre(resource: resource_with_errors) {
+    html_with_error = arbre(foo: resource_with_errors) {
       express_form(:foo) {
        text :name, value: 'ninja', class: 'slug'
       }
     }
     assert resource_with_errors.errors.any?
-    assert assigns[:resource].errors.any?
+    assert assigns[:foo].errors.any?
     assert_match has_error_class, html_with_error
   end
 

data/vendor/gems/express_templates/test/components/forms/checkbox_test.rb

@@ -1,12 +1,22 @@
 require 'test_helper'
 
 class CheckboxTest < ActiveSupport::TestCase
+
   def assigns
-    {resource: resource}
+    {account: resource}
+  end
+
+  def helpers
+    mock_action_view do
+      def accounts_path
+        '/accounts'
+      end
+    end
   end
 
+
   test "checkbox places the label before the input" do
-    html = arbre {
+    html = arbre(account: resource) {
       express_form(:account) {
         checkbox :eula
       }
@@ -21,7 +31,7 @@ class CheckboxTest < ActiveSupport::TestCase
   end
 
   test "checkbox respects label_after: true " do
-    html = arbre {
+    html = arbre(account: resource) {
       express_form(:account) {
         checkbox :eula, label_after: true
       }

data/vendor/gems/express_templates/test/components/forms/express_form_test.rb

@@ -6,24 +6,28 @@ require 'test_helper'
 
 class ExpressFormTest < ActiveSupport::TestCase
 
-  def assigns
-    {resource: resource}
-  end
-
   def simplest_form
-    arbre {
-      express_form(:resource) {
+    arbre(foo: resource) {
+      express_form(:foo) {
         submit value: 'Save it!'
       }
     }
   end
 
+  def helpers
+    mock_action_view do
+      def foos_path
+        '/foos'
+      end
+    end
+  end
+
   test "simplest form renders" do
     assert simplest_form
   end
 
   test "simplest form will have the proper id" do
-    assert_match /<form.*id="resource_1"/, simplest_form
+    assert_match /<form.*id="foo_1"/, simplest_form
   end
 
   test "simplest form contains form tag" do
@@ -48,7 +52,7 @@ class ExpressFormTest < ActiveSupport::TestCase
 
   test "simplest_form uses form_action for the action" do
     form_open_tag = simplest_form.match(/<form[^>]*>/)[0]
-    assert_match 'action="/resources"', form_open_tag
+    assert_match 'action="/foos"', form_open_tag
   end
 
   test "express_form default method is POST" do

data/vendor/gems/express_templates/test/components/forms/radio_test.rb

@@ -3,7 +3,19 @@ require 'test_helper'
 class RadioTest < ActiveSupport::TestCase
 
   def assigns
-    {resource: resource}
+    {person: ::Person.new}
+  end
+
+  def helpers
+    mock_action_view do
+      def people_path
+        '/people'
+      end
+
+      def employees_path
+        '/employees'
+      end
+    end
   end
 
   test "radio requires a parent component" do
@@ -58,7 +70,7 @@ class RadioTest < ActiveSupport::TestCase
   end
 
   def radio_with_options_omitted
-    html = arbre {
+    html = arbre(employee: resource) {
       express_form(:employee) {
         radio :department_id
       }

data/vendor/gems/express_templates/test/components/forms/select_test.rb

@@ -3,7 +3,15 @@ require 'ostruct'
 class SelectTest < ActiveSupport::TestCase
 
   def assigns
-    {resource: ::Person.new}
+    {person: ::Person.new}
+  end
+
+  def helpers
+    mock_action_view do
+      def people_path
+        '/people'
+      end
+    end
   end
 
 
@@ -112,8 +120,8 @@ class SelectTest < ActiveSupport::TestCase
       }
     }
     assert_match 'tagging_ids', html
-    assert_match /<option value="1">Friend<\/option>/, html
-    assert_match /<option value="2">Enemy<\/option>/, html
+    assert_match /<option selected="selected" value="1">Friend<\/option>/, html
+    assert_match /<option selected="selected" value="2">Enemy<\/option>/, html
     assert_match /<option value="3">Frenemy<\/option>/, html
   end