card 1.91 → 1.92

data/mod/bootstrap/spec/set/all/bootstrap/bootstrap_builder_spec.rb

@@ -1,31 +1,41 @@
-describe "bootstrap builder" do
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Bootstrap, "bootstrap builder" do
   class BuilderTest < Card::Format::HtmlFormat::Bootstrap::Component
-    add_tag_method :test_tag, "test-class" do |opts, _extra_args|
+    def_tag_method :test_tag, "test-class" do |html, opts, _extra_args|
+
+      before { tag :before, "prepend-class" }
+      after { tag :after, "after-class" }
       prepend { tag :prepend, "prepend-class" }
       append { tag :append, "append-class" }
-      insert { tag :insert, "insert-class" }
-      # wrap { |content| tag :wrap, "wrap-class" { content } }
+      wrap_inner :wrap, "wrap-class"
+      wrap :container
       opts
     end
+
+    def_div_method :container, "container-class"
   end
 
   describe "tag create helper methods" do
     subject do
       fo = Card["A"].format(:html)
-      tag = BuilderTest.render(fo) { test_tag }
-      "<buildertest>#{tag}<buildertest>"
+      BuilderTest.render(fo) do
+        test_tag do
+          "content"
+        end
+      end
     end
 
     it "appends work" do
-      # assert_select 'prepend[class="prepend-class"]'
-      assert_view_select subject, "buildertest" do
-        # assert_select 'prepend[class="prepend-class]"'
-        assert_select 'prepend[class="prepend-class]"'
-        assert_select 'test_tag[class="test-class"]' do
-          assert_select 'insert[class="insert-class]"'
+      skip "test_tag method needs to be repaired"
+      is_expected.to have_tag "container" do
+        with_tag 'prepend.prepend-class'
+        with_tag 'test_tag.test-class' do
+          with_tag 'insert.insert-class'
+          with_tag
+          with_tag 'wrap.wrap-class', text: "\ncontent"
         end
-
-        assert_select 'append[class="append-class]"'
+        with_tag 'append.append-class'
       end
     end
   end

data/mod/bootstrap/spec/set/all/bootstrap/bootstrap_spec.rb

@@ -1,4 +1,4 @@
-describe Card::Bootstrap do
+RSpec.describe Bootstrap do
   subject { described_class.new(format) }
 
   let(:format) { Card["A"].format(:html) }
@@ -11,7 +11,7 @@ describe Card::Bootstrap do
 
   it "loads components" do
     expect(subject).to respond_to(:form)
-    expect(subject.form).to be_instance_of ActiveSupport::SafeBuffer
+    expect(subject.form() {}).to eq "<form></form>"
   end
   describe "html" do
     it "renderes plain text" do

data/mod/bootstrap/spec/set/all/bootstrap/carousel_spec.rb

@@ -0,0 +1,65 @@
+# -*- encoding : utf-8 -*-
+<<-HTML
+<div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel">
+  <ol class="carousel-indicators">
+    <li data-target="#carouselExampleIndicators" data-slide-to="0" class="active"></li>
+    <li data-target="#carouselExampleIndicators" data-slide-to="1"></li>
+    <li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
+  </ol>
+  <div class="carousel-inner" role="listbox">
+    <div class="carousel-item active">
+      <img class="d-block img-fluid" src="..." alt="First slide">
+    </div>
+    <div class="carousel-item">
+      <img class="d-block img-fluid" src="..." alt="Second slide">
+    </div>
+    <div class="carousel-item">
+      <img class="d-block img-fluid" src="..." alt="Third slide">
+    </div>
+  </div>
+  <a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
+    <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+    <span class="sr-only">Previous</span>
+  </a>
+  <a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
+    <span class="carousel-control-next-icon" aria-hidden="true"></span>
+    <span class="sr-only">Next</span>
+  </a>
+</div>
+HTML
+
+describe Bootstrap::Component::Carousel do
+  subject {Card["A"].format(:html)}
+  specify "carousel helper" do
+    id = "csID"
+    carousel = subject.bs_carousel id, 0 do
+      item do
+        @html.img src: "item1"
+      end
+      item "item 2"
+    end
+
+    expect(carousel).to have_tag "div.carousel.slide#csID", "data-ride" => "carousel" do
+      with_tag "ol.carousel-indicators" do
+        with_tag "li.active", with: { "data-target" => "##{id}", "data-slide-to" => "0" }
+        with_tag "li", with: { "data-target" => "##{id}", "data-slide-to" => "1" }
+      end
+      with_tag "div.carousel-inner", role: "listbox" do
+        with_tag "div.carousel-item.active" do
+          with_tag :img, with: { src: "item1" }
+        end
+        with_tag "div.carousel-item" do
+          with_text /item 2/
+        end
+      end
+      with_tag "a.carousel-control-prev", href: "##{id}", role: "button", "data-slide" => "prev" do
+        with_tag "span.carousel-control-prev-icon"
+        with_tag "span.sr-only", text: "Previous"
+      end
+      with_tag "a.carousel-control-next", href: "##{id}", role: "button", "data-slide" => "next" do
+        with_tag "span.carousel-control-next-icon"
+        with_tag "span.sr-only", text: "Next"
+      end
+    end
+  end
+end

data/mod/bootstrap/spec/set/all/bootstrap/form_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Bootstrap::Component::Form do
+RSpec.describe Bootstrap::Component::Form do
   describe "input" do
     it "has form-group css class" do
       assert_view_select render_editor("Phrase"),
@@ -22,57 +22,17 @@ describe Bootstrap::Component::Form do
       form =
         subject.bs_form do
           group do
-            input "email", "Email Address", id: "theemail"
-            input "password", "Password", id: "thepassword"
+            input "email", label: "Email Address", id: "theemail"
+            input "password", label: "Password", id: "thepassword"
           end
         end
       expect(form).to have_tag :form do
         with_tag "div.form-group" do
           with_tag :label, with: { for: "theemail" },
-                           text: "\nEmail Address"
+                           text: "Email Address"
           with_tag "input.form-control", with: { type: "email", id: "theemail" }
         end
       end
     end
   end
-
-  describe "horizontal form" do
-    subject { Card["A"].format(:html) }
-
-    let(:form) do
-      subject.bs_horizontal_form 2, 10 do
-        group do
-          input "email", "Email Address", id: "theemail"
-          input "password", "Password", id: "thepassword"
-        end
-        group do
-          checkbox "test", "checkbox label", id: "thecheckbox"
-        end
-      end
-    end
-    let(:bsform) do
-      subject.bs do
-        horizontal_form 2, 10 do
-          group do
-            input "email", "Email Address", id: "theemail"
-            input "password", "Password", id: "thepassword"
-          end
-          group do
-            checkbox "test", "checkbox label", id: "thecheckbox"
-          end
-        end
-      end
-    end
-
-    it "creates form" do
-      assert_view_select bsform, 'form[class="form-horizontal"]' do
-        assert_select 'div[class="form-group"]' do
-          assert_select 'label[for="theemail"', text: "Email Address"
-          assert_select 'div[class="col-sm-10"]' do
-            assert_select 'input[type="email",id="theemail",class="form-control"]'
-          end
-        end
-      end
-    end
-  end
 end

data/mod/bootstrap/spec/set/all/bootstrap/horizontal_form_spec.rb

@@ -0,0 +1,46 @@
+# -*- encoding : utf-8 -*-
+
+RSpec.describe Bootstrap::Component::HorizontalForm do
+  describe "horizontal form" do
+    subject { Card["A"].format(:html) }
+
+    let(:form) do
+      subject.bs_horizontal_form 2, 10 do
+        group do
+          input "email", label: "Email Address", id: "theemail"
+          input "password", label: "Password", id: "thepassword"
+        end
+        group do
+          #checkbox "test", label: "checkbox label", id: "thecheckbox"
+        end
+      end
+    end
+    let(:bsform) do
+      subject.bs do
+        horizontal_form 2, 10 do
+          group do
+            input "email", label: "Email Address", id: "theemail"
+            input "password", label: "Password", id: "thepassword"
+          end
+          group do
+            checkbox "test", label: "checkbox label", id: "thecheckbox"
+          end
+        end
+      end
+    end
+
+    it "creates form" do
+      expect(form).to have_tag 'form.form-horizontal' do
+        with_tag 'div.form-group' do
+          with_tag 'label.col-sm-2.control-label[for="theemail"]', text: /Email Address/
+          with_tag 'div.col-sm-10' do
+            with_tag 'input.form-control#theemail[type="email"]'
+          end
+        end
+        # with_tag 'div.form-group' do
+        #   with_tag 'input[type="checkbox"]'
+        # end
+      end
+    end
+  end
+end

data/mod/bootstrap/spec/set/all/bootstrap/layout_spec.rb

@@ -1,121 +1,115 @@
-describe Bootstrap::Component::Layout do
-  describe "layout dsl" do
-    subject { Card["A"].format(:html) }
+describe Bootstrap::Component::Layout, "layout dsl" do
+  let(:format) { Card["A"].format(:html) }
 
-    it "creates correct layout with column array" do
-      layout = subject.bs_layout container: true, fluid: true do
-        row 6, 4, 2, class: "six-times-six" do
-          %w[c1 c2 c3]
-        end
+  it "creates correct layout with column array" do
+    layout = format.bs_layout container: true, fluid: true do
+      row 6, 4, 2, class: "six-times-six" do
+        %w[c1 c2 c3]
       end
-      assert_view_select layout, 'div[class="container-fluid"]' do
-        assert_select 'div[class="row six-times-six"]' do
-          assert_select 'div[class="col-md-6"]', text: "c1"
-          assert_select 'div[class="col-md-4"]', text: "c2"
-          assert_select 'div[class="col-md-2"]', text: "c3"
-        end
+    end
+    expect(layout).to have_tag("div.container-fluid") do
+      with_tag "div.row.six-times-six" do
+        with_tag "div.col-md-6", text: /c1/
+        with_tag "div.col-md-4", text: /c2/
+        with_tag "div.col-md-2", text: /c3/
       end
     end
+  end
 
-    it "creates correct layout with column calls" do
-      layout = subject.bs_layout do
-        row 8, 4, class: "six-times-six" do
-          column "c1"
-          column "c2", class: "extra-class"
-        end
-      end
-      assert_view_select layout, 'div[class="row six-times-six"]' do
-        assert_select 'div[class="col-md-8"]', text: "c1"
-        assert_select 'div[class="col-md-4 extra-class"]',
-                      text: "c2"
+  it "creates correct layout with column calls" do
+    layout = format.bs_layout do
+      row 8, 4, class: "six-times-six" do
+        column "c1"
+        column "c2", class: "extra-class"
       end
     end
+    expect(layout).to have_tag("div.row.six-times-six") do
+      with_tag "div.col-md-8", text: /c1/
+      with_tag "div.col-md-4.extra-class", text: /c2/
+    end
+  end
 
-    it "handles different medium sizes" do
-      layout = subject.bs_layout do
-        row md: [8, 4], xs: [6, 6], class: "six-times-six" do
-          column "c1"
-          column "c2", class: "extra-class"
-        end
-      end
-      assert_view_select layout, 'div[class="row six-times-six"]' do
-        assert_select 'div[class="col-md-8 col-xs-6"]', text: "c1"
-        assert_select 'div[class="col-md-4 col-xs-6 extra-class"]',
-                      text: "c2"
+  it "handles different medium sizes" do
+    layout = format.bs_layout do
+      row md: [8, 4], xs: [6, 6], class: "six-times-six" do
+        column "c1"
+        column "c2", class: "extra-class"
       end
     end
+    expect(layout).to have_tag("div.row.six-times-six") do
+      with_tag "div.col-md-8.col-xs-6", text: /c1/
+      with_tag "div.col-md-4.col-xs-6.extra-class", text: /c2/
+    end
+  end
 
-    it "works without column" do
-      layout = subject.bs_layout do
-        row  do
-          "test"
-        end
+  it "works without column" do
+    layout = format.bs_layout do
+      row do
+        "test"
       end
-      assert_view_select layout, 'div[class="row"]', text: "test"
     end
+    expect(layout).to have_tag "div.row", text: /test/
+  end
 
-    it "handles layout sequence" do
-      # format = Card["A"].form
-      lay = subject.bs do
-        layout do
-          row 8, 4 do
-            column "c1"
-            column "c2"
-          end
+  it "handles layout sequence" do
+    # format = Card["A"].form
+    lay = format.bs do
+      layout do
+        row 8, 4 do
+          column "c1"
+          column "c2"
         end
+      end
 
-        layout do
-          row 12, class: "six-times-six" do
-            column "new column"
-          end
+      layout do
+        row 12, class: "six-times-six" do
+          column "new column"
         end
       end
-      # assert_view_select lay, 'div[class="row"]' do
-      #   assert_select 'div[class="col-md-8"]', text: "c1"
-      #   assert_select 'div[class="col-md-4"]', text: "c2"
-      # end
-      assert_view_select lay, 'div[class="row six-times-six"]' do
-        assert_select 'div[class="col-md-12"]', text: "new column"
-      end
     end
 
-    it "handles nested layouts" do
-      # format = Card["A"].format :html
-      lay = subject.bs do
-        layout do
-          row 8, 4 do
-            column do
-              layout { row 12, ["c1"] }
+    expect(lay).to have_tag "div.row.six-times-six" do
+      with_tag "div.col-md-12", text: /new column/
+    end
+  end
+
+  it "handles nested layouts" do
+    # format = Card["A"].format :html
+    lay = format.bs do
+      layout do
+        row 8, 4 do
+          column do
+            layout {row 12, ["c1"]}
+          end
+          column do
+            row 12, ["c2"]
+            row 6 do
+              html "<span>s1</span>"
+              column "c3"
             end
-            column do
-              row 12, ["c2"]
-              row 6 do
-                html "<span>s1</span>"
-                column "c3"
-              end
-              row 8 do
-                "some content"
-              end
+            row 8 do
+              "some content"
             end
           end
         end
       end
-      assert_view_select lay, 'div[class="row"]' do
-        assert_select 'div[class="col-md-8"]' do
-          assert_select 'div[class="row"]' do
-            assert_select 'div[class="col-md-12"]', text: "c1"
-          end
+    end
+
+    expect(lay).to have_tag("div.row") do
+      with_tag "div.col-md-8" do
+        with_tag "div.row" do
+          with_tag "div.col-md-12", text: /c1/
         end
-        assert_select 'div[class="col-md-4"]' do
-          assert_select 'div[class="row"]' do
-            assert_select 'div[class="col-md-12"]', text: "c2"
-          end
-          assert_select 'div[class="row"]' do
-            assert_select 'div[class="col-md-6"]', text: "c3"
-            assert_select "span", text: "s1"
-          end
-          assert_select 'div[class="row"]', text: "some content"
+      end
+      with_tag "div.col-md-4" do
+        with_tag "div.row" do
+          with_tag "div.col-md-12", text: /c2/
+        end
+        with_tag "div.row" do
+          with_tag "div.col-md-6", text: /c3/
+          with_tag "span", text: /s1/
         end
+        with_tag "div.row", text: /some content/
       end
     end
   end