updated tests with keyword arguments

ddnexus · Apr 23, 2021 · 1538f24 · 1538f24
1 parent 6ce0c1d
commit 1538f24
Show file tree

Hide file tree

Showing 12 changed files with 263 additions and 110 deletions.
diff --git a/test/pagy/extras/bootstrap_test.rb b/test/pagy/extras/bootstrap_test.rb
diff --git a/test/pagy/extras/bulma_test.rb b/test/pagy/extras/bulma_test.rb
diff --git a/test/pagy/extras/foundation_test.rb b/test/pagy/extras/foundation_test.rb
diff --git a/test/pagy/extras/i18n_test.rb b/test/pagy/extras/i18n_test.rb
@@ -44,6 +44,10 @@
  _(view.pagy_info(Pagy.new(count: 1, i18n_key: 'activerecord.models.product'))).must_equal "Displaying <b>1</b> Product"
  _(view.pagy_info(Pagy.new(count: 13, i18n_key: 'activerecord.models.product'))).must_equal "Displaying <b>13</b> Products"
  _(view.pagy_info(Pagy.new(count: 100, i18n_key: 'activerecord.models.product', page: 3))).must_equal "Displaying Products <b>41-60</b> of <b>100</b> in total"
+ _(view.pagy_info(Pagy.new(count: 0), i18n_key: 'activerecord.models.product')).must_equal "No Products found"
+ _(view.pagy_info(Pagy.new(count: 1), i18n_key: 'activerecord.models.product')).must_equal "Displaying <b>1</b> Product"
+ _(view.pagy_info(Pagy.new(count: 13), i18n_key: 'activerecord.models.product')).must_equal "Displaying <b>13</b> Products"
+ _(view.pagy_info(Pagy.new(count: 100, page: 3), i18n_key: 'activerecord.models.product')).must_equal "Displaying Products <b>41-60</b> of <b>100</b> in total"
  end
  end
 

diff --git a/test/pagy/extras/items_countless_test.rb b/test/pagy/extras/items_countless_test.rb
@@ -194,7 +194,7 @@
 
  it 'renders items selector' do
  @pagy = Pagy.new count: 1000, page: 3
- _(view.pagy_items_selector_js(@pagy, 'test-id')).must_equal \
+ _(view.pagy_items_selector_js(@pagy, pagy_id: 'test-id')).must_equal \
  "<span id=\"test-id\">Show <input type=\"number\" min=\"1\" max=\"100\" value=\"20\" style=\"padding: 0; text-align: center; width: 3rem;\"> items per page</span><script type=\"application/json\" class=\"pagy-json\">[\"items_selector\",41,\"<a href=\\\"/foo?page=__pagy_page__&items=__pagy_items__\\\" style=\\\"display: none;\\\"></a>\"]</script>"
  end
 

diff --git a/test/pagy/extras/items_elasticsearch_test.rb b/test/pagy/extras/items_elasticsearch_test.rb
@@ -186,7 +186,7 @@
 
  it 'renders items selector' do
  @pagy = Pagy.new count: 1000, page: 3
- _(view.pagy_items_selector_js(@pagy, 'test-id')).must_equal \
+ _(view.pagy_items_selector_js(@pagy, pagy_id: 'test-id')).must_equal \
  "<span id=\"test-id\">Show <input type=\"number\" min=\"1\" max=\"100\" value=\"20\" style=\"padding: 0; text-align: center; width: 3rem;\"> items per page</span><script type=\"application/json\" class=\"pagy-json\">[\"items_selector\",41,\"<a href=\\\"/foo?page=__pagy_page__&items=__pagy_items__\\\" style=\\\"display: none;\\\"></a>\"]</script>"
  end
 

diff --git a/test/pagy/extras/items_trim_test.rb b/test/pagy/extras/items_trim_test.rb
@@ -32,7 +32,7 @@
 
  it 'renders items selector with trim' do
  pagy = Pagy.new count: 1000, page: 3
- _(view.pagy_items_selector_js(pagy, 'test-id')).must_equal "<span id=\"test-id\">Show <input type=\"number\" min=\"1\" max=\"100\" value=\"20\" style=\"padding: 0; text-align: center; width: 3rem;\"> items per page</span><script type=\"application/json\" class=\"pagy-json\">[\"items_selector\",41,\"<a href=\\\"/foo?page=__pagy_page__&items=__pagy_items__\\\" style=\\\"display: none;\\\"></a>\",\"page\"]</script>"
+ _(view.pagy_items_selector_js(pagy, pagy_id: 'test-id')).must_equal "<span id=\"test-id\">Show <input type=\"number\" min=\"1\" max=\"100\" value=\"20\" style=\"padding: 0; text-align: center; width: 3rem;\"> items per page</span><script type=\"application/json\" class=\"pagy-json\">[\"items_selector\",41,\"<a href=\\\"/foo?page=__pagy_page__&items=__pagy_items__\\\" style=\\\"display: none;\\\"></a>\",\"page\"]</script>"
  end
 
  end

diff --git a/test/pagy/extras/materialize_test.rb b/test/pagy/extras/materialize_test.rb
diff --git a/test/pagy/extras/navs_test.rb b/test/pagy/extras/navs_test.rb
diff --git a/test/pagy/extras/semantic_test.rb b/test/pagy/extras/semantic_test.rb
diff --git a/test/pagy/extras/uikit_test.rb b/test/pagy/extras/uikit_test.rb
diff --git a/test/pagy/frontend_test.rb b/test/pagy/frontend_test.rb
@@ -12,29 +12,36 @@
  pagy = Pagy.new count: 103, page: 1
  _(view.pagy_nav(pagy)).must_equal \
  "<nav class=\"pagy-nav pagination\" role=\"navigation\" aria-label=\"pager\"><span class=\"page prev disabled\">&lsaquo;&nbsp;Prev</span> <span class=\"page active\">1</span> <span class=\"page\"><a href=\"/foo?page=2\" rel=\"next\" >2</a></span> <span class=\"page\"><a href=\"/foo?page=3\" >3</a></span> <span class=\"page\"><a href=\"/foo?page=4\" >4</a></span> <span class=\"page\"><a href=\"/foo?page=5\" >5</a></span> <span class=\"page\"><a href=\"/foo?page=6\" >6</a></span> <span class=\"page next\"><a href=\"/foo?page=2\" rel=\"next\" aria-label=\"next\">Next&nbsp;&rsaquo;</a></span></nav>"
+ _(view.pagy_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_equal \
+ "<nav id=\"test-nav-id\" class=\"pagy-nav pagination\" role=\"navigation\" aria-label=\"pager\"><span class=\"page prev disabled\">&lsaquo;&nbsp;Prev</span> <span class=\"page active\">1</span> <span class=\"page\"><a href=\"/foo?page=2\" link-extra rel=\"next\" >2</a></span> <span class=\"page\"><a href=\"/foo?page=3\" link-extra >3</a></span> <span class=\"page\"><a href=\"/foo?page=4\" link-extra >4</a></span> <span class=\"page\"><a href=\"/foo?page=5\" link-extra >5</a></span> <span class=\"page\"><a href=\"/foo?page=6\" link-extra >6</a></span> <span class=\"page next\"><a href=\"/foo?page=2\" link-extra rel=\"next\" aria-label=\"next\">Next&nbsp;&rsaquo;</a></span></nav>"
  end
 
  it 'renders page 3' do
  pagy = Pagy.new count: 103, page: 3
  _(view.pagy_nav(pagy)).must_equal \
  "<nav class=\"pagy-nav pagination\" role=\"navigation\" aria-label=\"pager\"><span class=\"page prev\"><a href=\"/foo?page=2\" rel=\"prev\" aria-label=\"previous\">&lsaquo;&nbsp;Prev</a></span> <span class=\"page\"><a href=\"/foo?page=1\" >1</a></span> <span class=\"page\"><a href=\"/foo?page=2\" rel=\"prev\" >2</a></span> <span class=\"page active\">3</span> <span class=\"page\"><a href=\"/foo?page=4\" rel=\"next\" >4</a></span> <span class=\"page\"><a href=\"/foo?page=5\" >5</a></span> <span class=\"page\"><a href=\"/foo?page=6\" >6</a></span> <span class=\"page next\"><a href=\"/foo?page=4\" rel=\"next\" aria-label=\"next\">Next&nbsp;&rsaquo;</a></span></nav>"
+ _(view.pagy_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_equal \
+ "<nav id=\"test-nav-id\" class=\"pagy-nav pagination\" role=\"navigation\" aria-label=\"pager\"><span class=\"page prev\"><a href=\"/foo?page=2\" link-extra rel=\"prev\" aria-label=\"previous\">&lsaquo;&nbsp;Prev</a></span> <span class=\"page\"><a href=\"/foo?page=1\" link-extra >1</a></span> <span class=\"page\"><a href=\"/foo?page=2\" link-extra rel=\"prev\" >2</a></span> <span class=\"page active\">3</span> <span class=\"page\"><a href=\"/foo?page=4\" link-extra rel=\"next\" >4</a></span> <span class=\"page\"><a href=\"/foo?page=5\" link-extra >5</a></span> <span class=\"page\"><a href=\"/foo?page=6\" link-extra >6</a></span> <span class=\"page next\"><a href=\"/foo?page=4\" link-extra rel=\"next\" aria-label=\"next\">Next&nbsp;&rsaquo;</a></span></nav>"
  end
 
  it 'renders page 6' do
  pagy = Pagy.new count: 103, page: 6
  _(view.pagy_nav(pagy)).must_equal \
  "<nav class=\"pagy-nav pagination\" role=\"navigation\" aria-label=\"pager\"><span class=\"page prev\"><a href=\"/foo?page=5\" rel=\"prev\" aria-label=\"previous\">&lsaquo;&nbsp;Prev</a></span> <span class=\"page\"><a href=\"/foo?page=1\" >1</a></span> <span class=\"page\"><a href=\"/foo?page=2\" >2</a></span> <span class=\"page\"><a href=\"/foo?page=3\" >3</a></span> <span class=\"page\"><a href=\"/foo?page=4\" >4</a></span> <span class=\"page\"><a href=\"/foo?page=5\" rel=\"prev\" >5</a></span> <span class=\"page active\">6</span> <span class=\"page next disabled\">Next&nbsp;&rsaquo;</span></nav>"
- end
+ _(view.pagy_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_equal \
+ "<nav id=\"test-nav-id\" class=\"pagy-nav pagination\" role=\"navigation\" aria-label=\"pager\"><span class=\"page prev\"><a href=\"/foo?page=5\" link-extra rel=\"prev\" aria-label=\"previous\">&lsaquo;&nbsp;Prev</a></span> <span class=\"page\"><a href=\"/foo?page=1\" link-extra >1</a></span> <span class=\"page\"><a href=\"/foo?page=2\" link-extra >2</a></span> <span class=\"page\"><a href=\"/foo?page=3\" link-extra >3</a></span> <span class=\"page\"><a href=\"/foo?page=4\" link-extra >4</a></span> <span class=\"page\"><a href=\"/foo?page=5\" link-extra rel=\"prev\" >5</a></span> <span class=\"page active\">6</span> <span class=\"page next disabled\">Next&nbsp;&rsaquo;</span></nav>" end
 
  it 'renders page 10' do
  pagy = Pagy.new count: 1000, page: 10
  _(view.pagy_nav(pagy)).must_equal \
  "<nav class=\"pagy-nav pagination\" role=\"navigation\" aria-label=\"pager\"><span class=\"page prev\"><a href=\"/foo?page=9\" rel=\"prev\" aria-label=\"previous\">&lsaquo;&nbsp;Prev</a></span> <span class=\"page\"><a href=\"/foo?page=1\" >1</a></span> <span class=\"page gap\">&hellip;</span> <span class=\"page\"><a href=\"/foo?page=6\" >6</a></span> <span class=\"page\"><a href=\"/foo?page=7\" >7</a></span> <span class=\"page\"><a href=\"/foo?page=8\" >8</a></span> <span class=\"page\"><a href=\"/foo?page=9\" rel=\"prev\" >9</a></span> <span class=\"page active\">10</span> <span class=\"page\"><a href=\"/foo?page=11\" rel=\"next\" >11</a></span> <span class=\"page\"><a href=\"/foo?page=12\" >12</a></span> <span class=\"page\"><a href=\"/foo?page=13\" >13</a></span> <span class=\"page\"><a href=\"/foo?page=14\" >14</a></span> <span class=\"page gap\">&hellip;</span> <span class=\"page\"><a href=\"/foo?page=50\" >50</a></span> <span class=\"page next\"><a href=\"/foo?page=11\" rel=\"next\" aria-label=\"next\">Next&nbsp;&rsaquo;</a></span></nav>"
- end
+ _(view.pagy_nav(pagy, pagy_id: 'test-nav-id', link_extra: 'link-extra')).must_equal \
+ "<nav id=\"test-nav-id\" class=\"pagy-nav pagination\" role=\"navigation\" aria-label=\"pager\"><span class=\"page prev\"><a href=\"/foo?page=9\" link-extra rel=\"prev\" aria-label=\"previous\">&lsaquo;&nbsp;Prev</a></span> <span class=\"page\"><a href=\"/foo?page=1\" link-extra >1</a></span> <span class=\"page gap\">&hellip;</span> <span class=\"page\"><a href=\"/foo?page=6\" link-extra >6</a></span> <span class=\"page\"><a href=\"/foo?page=7\" link-extra >7</a></span> <span class=\"page\"><a href=\"/foo?page=8\" link-extra >8</a></span> <span class=\"page\"><a href=\"/foo?page=9\" link-extra rel=\"prev\" >9</a></span> <span class=\"page active\">10</span> <span class=\"page\"><a href=\"/foo?page=11\" link-extra rel=\"next\" >11</a></span> <span class=\"page\"><a href=\"/foo?page=12\" link-extra >12</a></span> <span class=\"page\"><a href=\"/foo?page=13\" link-extra >13</a></span> <span class=\"page\"><a href=\"/foo?page=14\" link-extra >14</a></span> <span class=\"page gap\">&hellip;</span> <span class=\"page\"><a href=\"/foo?page=50\" link-extra >50</a></span> <span class=\"page next\"><a href=\"/foo?page=11\" link-extra rel=\"next\" aria-label=\"next\">Next&nbsp;&rsaquo;</a></span></nav>" end
 
  it 'renders with link_extras' do
  pagy = Pagy.new count: 103, page: 1, link_extra: "X"
  _(view.pagy_nav(pagy)).must_include '?page=2" X rel'
+ _(view.pagy_nav(pagy, link_extra: 'link-extra')).must_include '?page=2" X link-extra rel'
  end
 
  end
@@ -127,10 +134,10 @@
  end
 
  it 'overrides the item_name' do
- _(view.pagy_info(Pagy.new(count: 0), 'Widgets')).must_equal "No Widgets found"
- _(view.pagy_info(Pagy.new(count: 1), 'Widget')).must_equal "Displaying <b>1</b> Widget"
- _(view.pagy_info(Pagy.new(count: 13), 'Widgets')).must_equal "Displaying <b>13</b> Widgets"
- _(view.pagy_info(Pagy.new(count: 100, page: 3), 'Widgets')).must_equal "Displaying Widgets <b>41-60</b> of <b>100</b> in total"
+ _(view.pagy_info(Pagy.new(count: 0), item_name: 'Widgets')).must_equal "No Widgets found"
+ _(view.pagy_info(Pagy.new(count: 1), item_name: 'Widget')).must_equal "Displaying <b>1</b> Widget"
+ _(view.pagy_info(Pagy.new(count: 13), item_name: 'Widgets')).must_equal "Displaying <b>13</b> Widgets"
+ _(view.pagy_info(Pagy.new(count: 100, page: 3), item_name: 'Widgets')).must_equal "Displaying Widgets <b>41-60</b> of <b>100</b> in total"
  end
 
  end
@@ -173,4 +180,13 @@
 
  end
 
+ describe '#pagy_deprecated_arg' do
+
+ it 'deprecate arg and returns right value' do
+ _ { _(view.pagy_deprecated_arg(:arg, 'deprecated-val', :new_key, 'new-value')).must_equal 'new-value' }.must_output nil, \
+ "[PAGY WARNING] deprecated positional `arg` arg, it will be removed in 5.0! Use only the keyword arg `new_key: \"new-value\"` instead.\n"
+ end
+
+ end
+
 end