Merge remote-tracking branch 'origin/31072020_pwengerter_defaultOrder_collection' into 20200824_use-html-attributes-and-properties-everywhere

Author: Nils Henning

app/concepts/matestack/ui/core/collection/order/order.rb

@@ -7,7 +7,7 @@ def setup
     end
 
     def response
-      div @tag_attributes do
+      div html_attributes do
         yield_components
       end
     end

app/concepts/matestack/ui/core/collection/order/toggle/indicator/indicator.rb

@@ -2,7 +2,7 @@ module Matestack::Ui::Core::Collection::Order::Toggle::Indicator
   class Indicator < Matestack::Ui::Core::Component::Static
 
     def response
-      span @tag_attributes do
+      span html_attributes do
         span attributes: {"v-if": "ordering['#{@component_config[:key]}'] === undefined"}, text: @component_config[:default]
         unescaped "{{
           orderIndicator('#{@component_config[:key]}', { asc: '#{@component_config[:asc]}', desc: '#{@component_config[:desc]}'})

app/concepts/matestack/ui/core/collection/order/toggle/toggle.haml

@@ -1,3 +1,3 @@
-%a{@tag_attributes, "@click": "toggleOrder(\"#{@component_config[:key]}\")"}
+%a{ html_attributes, "@click": "toggleOrder(\"#{@component_config[:key]}\")" }
   - if block_given?
     = yield

app/concepts/matestack/ui/core/collection/order/toggle/toggle.rb

@@ -1,5 +1,4 @@
 module Matestack::Ui::Core::Collection::Order::Toggle
   class Toggle < Matestack::Ui::Core::Component::Static
-
   end
 end

spec/test/components/dynamic/collection/complete_spec.rb

@@ -72,13 +72,13 @@ def ordering
       end
 
       def content
-        async rerender_on: "my-first-collection-update", id: "my-collection" do
+        async rerender_on: 'my-first-collection-update', id: 'my-collection' do
           collection_content @my_collection.config do
             ul do
               @my_collection.paginated_data.each do |dummy|
-                li class: "item" do
+                li class: 'item' do
                   plain dummy.title
-                  plain " "
+                  plain ' '
                   plain dummy.description
                 end
               end
@@ -259,13 +259,13 @@ def ordering_1
       end
 
       def content_1
-        async rerender_on: "my-first-collection-update", id: "my-collection-1" do
+        async rerender_on: 'my-first-collection-update', id: 'my-collection-1' do
           collection_content @my_first_collection.config do
             ul do
               @my_first_collection.paginated_data.each do |dummy|
-                li class: "item" do
+                li class: 'item' do
                   plain dummy.title
-                  plain " "
+                  plain ' '
                   plain dummy.description
                 end
               end
@@ -318,13 +318,13 @@ def ordering_2
       end
 
       def content_2
-        async rerender_on: "my-second-collection-update", id: "my-collection-2" do
+        async rerender_on: 'my-second-collection-update', id: 'my-collection-2' do
           collection_content @my_second_collection.config do
             ul do
               @my_second_collection.paginated_data.each do |dummy|
-                li class: "item" do
+                li class: 'item' do
                   plain dummy.title
-                  plain " "
+                  plain ' '
                   plain dummy.description
                 end
               end
@@ -502,13 +502,13 @@ def response
       end
 
       def content
-        async rerender_on: "my-first-collection-update", id: "my-collection" do
+        async rerender_on: 'my-first-collection-update', id: 'my-collection' do
           collection_content @my_collection.config do
             ul do
               @my_collection.paginated_data.each do |dummy|
                 li do
                   plain dummy.title
-                  plain " "
+                  plain ' '
                   plain dummy.description
                   action my_action_config(dummy.id) do
                     button text: "delete #{dummy.title}"

spec/test/components/dynamic/collection/order_spec.rb

@@ -48,7 +48,9 @@ def ordering
             collection_order_toggle key: :title do
               button do
                 plain "title"
-                collection_order_toggle_indicator key: :title, asc: ' asc', desc: ' desc'
+                collection_order_toggle_indicator key: :title, default: ' created_at', asc: ' asc', desc: ' desc'
+                # try line below
+                # collection_order_toggle_indicator default: ' created_at', asc: ' asc', desc: ' desc'
               end
             end
           end
@@ -72,11 +74,11 @@ def content
       end
 
       visit "/example"
-      expect(page).to have_button("title")
+      expect(page).to have_button("title created_at")
       expect(all(".item").first.text).to eq "some-title-1 some-description-1"
       expect(all(".item").last.text).to eq "some-title-11 some-description-11"
 
-      click_button "title"
+      click_button "title created_at"
       sleep 0.2 # otherwise getting stale element error, quick fix
       expect(page).to have_button("title asc")
       expect(all(".item").first.text).to eq "some-title-1 some-description-1"
@@ -90,16 +92,16 @@ def content
 
       click_button "title desc"
       sleep 0.2 # otherwise getting stale element error, quick fix
-      expect(page).to have_button("title")
+      expect(page).to have_button("title created_at")
       expect(all(".item").first.text).to eq "some-title-1 some-description-1"
       expect(all(".item").last.text).to eq "some-title-11 some-description-11"
 
       # test persistent state
       page.driver.browser.navigate.refresh
       sleep 0.2 # otherwise getting stale element error, quick fix
-      expect(page).to have_button("title")
+      expect(page).to have_button("title created_at")
       expect(all(".item").first.text).to eq "some-title-1 some-description-1"
       expect(all(".item").last.text).to eq "some-title-11 some-description-11"
     end
   end
-end
+end

spec/test/components/dynamic/collection/pagination_spec.rb

@@ -238,4 +238,4 @@ def my_action_config id
 
   end
 
-end
+end