RubyGems - middleman-asciidoc - Versions diffs - 1.0.0.rc.3 → 1.0.0.rc.4 - Mend

middleman-asciidoc 1.0.0.rc.3 → 1.0.0.rc.4

Files changed (54) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d408ad1c5872270863cdc6e626014d24eec8eaa523ee4fee42b52ab910a85c
-  data.tar.gz: 245786b049319ca48ed1fba34e98a50419980c7e0b8eecd6e77556be1b341220
+  metadata.gz: 09404febee1aa7a38d25fbeb16e29c21e1790e3a3eb5f4033d2c19aa1c016467
+  data.tar.gz: cf334b89c66b3415fab2af159461c32f4c292d5907f0dfd1d0f8e92932612387
 SHA512:
-  metadata.gz: bda2d717b1d551dbc07433b580a6f34a9815725218aa19837515448b7605c1c54d7db41471d8a31a2588e9b8a3f1424588a3b18d4c13c94d60583c2c24a88555
-  data.tar.gz: 780f90f69d6bc617c9be0e52f3d970994eaedd4f28698ca43ab0a260d8e573dd32dd8479afc48ff26ceda6e1e2556df5dfc08c7d767fe66de8fb910de184320c
+  metadata.gz: c97fc8f19a5531aac959f91332e442b15de33b8834475f2b5f075f6cd2005a3190f9343b10264b43347941f9954e6e8562fee07737901a9f1f2c97ad0d4ea4d6
+  data.tar.gz: 88802a4fe982d3fd841426c56f9ef9738d7a117203b7d80c6af1f02adff690f70efb3359188f6d695e4274d8b4b1d74af60e5455a53d269a8005fd186dfbfbd0

data/Gemfile CHANGED Viewed

@@ -3,11 +3,10 @@ source 'https://rubygems.org'
 # Runtime dependencies are defined in middleman-asciidoc.gemspec
 gemspec
-if RUBY_ENGINE == 'jruby'
-  git 'https://github.com/mojavelinux/middleman.git', branch: 'no-fast-blank' do
-    gem 'middleman-core'
-  end
-end
+# NOTE when running tests on JRuby, use version of middleman-core that does not depend on fast_blank
+git 'https://github.com/middleman/middleman.git', ref: '1d13e415e27aa1b30d85fecebf8cc0f91d4023c6' do
+  gem 'middleman-core'
+end if RUBY_ENGINE == 'jruby'
 # Build and doc tools
 gem 'rake', '~> 10.3', require: false
@@ -21,6 +20,10 @@ gem 'capybara', '~> 2.5.0', require: false
 # Code quality tools
 gem 'cane', platforms: :mri, require: false
+# Additional libraries for testing
 # Middleman itself (use for testing against development version)
 #gem 'middleman-core', :github => 'middleman/middleman', :branch => 'master'
+gem 'middleman-blog', '~> 4.0', require: false
+# NOTE middleman-cli required by middleman-blog
+gem 'middleman-cli', '~> 4.0', require: false
 gem 'listen', '~> 3.0.0', require: false # see https://github.com/middleman/middleman/pull/1891

data/README.adoc CHANGED Viewed

@@ -1,6 +1,6 @@
 = AsciiDoc Extension for Middleman (powered by Asciidoctor)
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.0.rc.3, 2017-11-25
+v1.0.0.rc.4, 2017-11-29
 // Settings:
 :idprefix:
 :idseparator: -
@@ -211,7 +211,7 @@ Here are the different ways to specify a layout:
 * `:page-layout:`, `:page-layout: _auto_layout`, or _not specified_ -- use the automatic layout (default: layout)
 * `:page-layout: custom` -- use the page layout named "`custom`" (e.g., [.path]_custom.erb_)
 * `:!page-layout:` or `:page-layout: false` -- generate a standalone HTML document
-* `:page-layout: -` -- no layout (don't wrap content in a layout at all)
+* `:page-layout: ~` or `:page-layout: null` -- generate a page without a layout (don't wrap content in a layout)
 .Layout for blog posts
 WARNING: If you're using the Middleman Blog extension to write blog posts, the `layout` property on the blog configuration overrides the default layout, but you can still override that setting using the `page-layout` attribute in each post.

data/features/asciidoc-blog.feature ADDED Viewed

@@ -0,0 +1,122 @@
+Feature: Blog Integration
+  In order to test blog articles written in AsciiDoc
+  Scenario: A blog article is generated from an AsciiDoc document
+    Given the Server is running at "asciidoc-blog-app"
+    When I go to "/blog/welcome.html"
+    Then I should see:
+      """
+      <!DOCTYPE html>
+      <html>
+        <head>
+          <title>Welcome</title>
+        </head>
+        <body>
+          <article>
+            <header>
+              <span>by Blog Author</span>
+              <time datetime="2017-09-01T15:00:00Z">Sep  1, 2017</time>
+            </header>
+            <h1>Welcome</h1>
+      <div class="paragraph">
+      <p>Welcome to my blog.</p>
+      </div>
+          </article>
+        </body>
+      </html>
+      """
+  Scenario: A blog article should accommodate multiple authors
+    Given the Server is running at "asciidoc-blog-app"
+    When I go to "/blog/joint-effort.html"
+    Then I should see "John Smith, Jane Doe, Doc Writer"
+  Scenario: A blog article marked as not published should be published when running the local server
+    Given the Server is running at "asciidoc-blog-app"
+    When I go to "/blog/not-published.html"
+    Then I should see:
+      """
+      This article should only be published when running the local server.
+      """
+  Scenario: A blog article marked as not published should not be listed if filtered out
+    Given a fixture app "asciidoc-blog-app"
+    And app "asciidoc-blog-app" is using config "published-only"
+    And the Server is running
+    When I go to "/index.html"
+    Then I should not see "/blog/not-published.html"
+  @nojava
+  Scenario: A blog article marked as not published should not be published when generating the site
+    Given a fixture app "asciidoc-blog-app"
+    And I run `middleman build`
+    And was successfully built
+    When I cd to "build"
+    Then the following files should not exist:
+    | blog/not-published.html |
+  Scenario: A blog article marked as ignored should not be published
+    Given the Server is running at "asciidoc-blog-app"
+    When I go to "/blog/ignored.html"
+    Then I should see "Not Found"
+  Scenario: The layout defined in blog configuration takes precedence over the layout defined in AsciiDoc configuration
+    Given a fixture app "asciidoc-blog-app"
+    And app "asciidoc-blog-app" is using config "asciidoc-layout"
+    And the Server is running
+    When I go to "/blog/welcome.html"
+    Then I should see:
+      """
+      <article>
+      """
+  Scenario: Specifying a layout for an article overrides layout defined in blog configuration
+    Given the Server is running at "asciidoc-blog-app"
+    When I go to "/blog/custom-layout.html"
+    Then I should see:
+      """
+      <title>AsciiDoc Page: Custom Layout</title>
+      """
+  Scenario: Tags can be specified for an article in the AsciiDoc header as comma-separated list
+    Given the Server is running at "asciidoc-blog-app"
+    When I go to "/blog/tags-tags-tags.html"
+    Then I should see:
+      """
+              <span class="tags">
+                <span class="tag">fee</span>
+                <span class="tag">fi</span>
+                <span class="tag">fo</span>
+                <span class="tag">fum</span>
+              </span>
+      """
+  Scenario: Tags can be specified for an article in the AsciiDoc header as an array
+    Given the Server is running at "asciidoc-blog-app"
+    When I go to "/blog/more-tags.html"
+    Then I should see:
+      """
+              <span class="tags">
+                <span class="tag">bar</span>
+                <span class="tag">baz</span>
+                <span class="tag">foo</span>
+              </span>
+      """
+  Scenario: A custom slug can be specified for an article in the AsciiDoc header
+    Given the Server is running at "asciidoc-blog-app"
+    When I go to "/blog/heisenberg.html"
+    Then I should see:
+      """
+      <h1>Say My Name</h1>
+      """
+  Scenario: The date specified in the article overrides the date in the filename
+    Given a fixture app "asciidoc-blog-app"
+    And app "asciidoc-blog-app" is using config "date-in-filename"
+    And the Server is running
+    When I go to "/blog-2/2017/a-fresh-start.html"
+    Then I should see:
+      """
+      <time datetime="2017-09-01T15:45:00Z">Sep  1, 2017</time>
+      """

data/features/{asciidoc.feature → asciidoc-pages.feature} RENAMED Viewed

@@ -1,8 +1,8 @@
 Feature: AsciiDoc Support
-  In order to test included AsciiDoc support
+  In order to test AsciiDoc support
   Scenario: Rendering html
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/hello.html"
     Then I should see:
       """
@@ -13,7 +13,7 @@ Feature: AsciiDoc Support
       """
   Scenario: Rendering html with double file extension
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/hello-with-extension.html"
     Then I should see:
       """
@@ -24,13 +24,13 @@ Feature: AsciiDoc Support
       """
   Scenario: Rendering html with layout defined in extension config
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, layout: :default
       set :layout, :global
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/hello.html"
     Then I should see:
       """
@@ -49,17 +49,13 @@ Feature: AsciiDoc Support
       """
   Scenario: Rendering html with no layout specified
-    Given a fixture app "asciidoc-app"
-    And a file named "config.rb" with:
-      """
-      activate :asciidoc
-      set :layout, :default
-      """
+    Given a fixture app "asciidoc-pages-app"
+    And app "asciidoc-pages-app" is using config "default-layout"
     And a file named "source/no-layout.adoc" with:
       """
       Hello, AsciiDoc!
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/no-layout.html"
     Then I should see:
       """
@@ -77,19 +73,15 @@ Feature: AsciiDoc Support
       """
   Scenario: Rendering html with auto layout specified
-    Given a fixture app "asciidoc-app"
-    And a file named "config.rb" with:
-      """
-      activate :asciidoc
-      set :layout, :default
-      """
+    Given a fixture app "asciidoc-pages-app"
+    And app "asciidoc-pages-app" is using config "default-layout"
     And a file named "source/auto-layout.adoc" with:
       """
       :page-layout: _auto_layout
       Hello, AsciiDoc!
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/auto-layout.html"
     Then I should see:
       """
@@ -107,19 +99,15 @@ Feature: AsciiDoc Support
       """
   Scenario: Rendering html with blank layout specified
-    Given a fixture app "asciidoc-app"
-    And a file named "config.rb" with:
-      """
-      activate :asciidoc
-      set :layout, :default
-      """
+    Given a fixture app "asciidoc-pages-app"
+    And app "asciidoc-pages-app" is using config "default-layout"
     And a file named "source/blank-layout.adoc" with:
       """
       :page-layout:
       Hello, AsciiDoc!
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/blank-layout.html"
     Then I should see:
       """
@@ -137,14 +125,14 @@ Feature: AsciiDoc Support
       """
   Scenario: Rendering html with explicit layout specified
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "source/explicit-layout.adoc" with:
       """
       :page-layout: default
       Hello, AsciiDoc!
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/explicit-layout.html"
     Then I should see:
       """
@@ -162,20 +150,20 @@ Feature: AsciiDoc Support
       """
   Scenario: Rendering html with layout unset
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "source/unset-layout.adoc" with:
       """
       :!page-layout:
       Hello, AsciiDoc!
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/unset-layout.html"
     Then I should see:
       """
       <meta name="generator" content="Asciidoctor
       """
-    Then I should see:
+    And I should see:
       """
       <div class="paragraph">
       <p>Hello, AsciiDoc!</p>
@@ -183,45 +171,45 @@ Feature: AsciiDoc Support
       """
   Scenario: Rendering html with false layout specified
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "source/false-layout.adoc" with:
       """
       :page-layout: false
       Hello, AsciiDoc!
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/false-layout.html"
     Then I should see:
       """
       <meta name="generator" content="Asciidoctor
       """
-    Then I should see:
+    And I should see:
       """
       <div class="paragraph">
       <p>Hello, AsciiDoc!</p>
       </div>
       """
-  Scenario: Rendering html with ~ layout specified
-    Given a fixture app "asciidoc-app"
-    And a file named "source/minus-layout.adoc" with:
+  Scenario: Rendering html with null layout specified
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "source/null-layout.adoc" with:
       """
-      :page-layout: -
+      :page-layout: null
       Hello, AsciiDoc!
       """
-    Given the Server is running at "asciidoc-app"
-    When I go to "/minus-layout.html"
+    And the Server is running at "asciidoc-pages-app"
+    When I go to "/null-layout.html"
     Then I should not see:
       """
       <!DOCTYPE html>
       """
-    Then I should not see:
+    And I should not see:
       """
       <meta name="generator" content="Asciidoctor
       """
-    Then I should see:
+    And I should see:
       """
       <div class="paragraph">
       <p>Hello, AsciiDoc!</p>
@@ -229,8 +217,8 @@ Feature: AsciiDoc Support
       """
   Scenario: Rendering html using title and tags from document
-    Given the Server is running at "asciidoc-app"
-    When I go to "/hello-with-title.html"
+    Given the Server is running at "asciidoc-pages-app"
+    When I go to "/hello-with-title-and-tags.html"
     Then I should see:
       """
       <!DOCTYPE html>
@@ -249,13 +237,9 @@ Feature: AsciiDoc Support
       """
   Scenario: Default safe mode for AsciiDoc processor
-    Given a fixture app "asciidoc-app"
-    And a file named "config.rb" with:
-      """
-      activate :asciidoc
-      set :layout, :default
-      """
-    Given the Server is running at "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
+    And app "asciidoc-pages-app" is using config "default-layout"
+    And the Server is running
     When I go to "/safe-mode.html"
     Then I should see:
       """
@@ -273,13 +257,13 @@ Feature: AsciiDoc Support
       """
   Scenario: Setting safe mode on AsciiDoc processor
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, safe: :unsafe
       set :layout, :default
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/safe-mode.html"
     Then I should see:
       """
@@ -296,8 +280,30 @@ Feature: AsciiDoc Support
       </html>
       """
+  Scenario: Setting backend on AsciiDoc processor
+    Given a fixture app "asciidoc-pages-app"
+    And a file named "config.rb" with:
+      """
+      activate :asciidoc, backend: 'xhtml'
+      set :layout, :default
+      """
+    And the Server is running
+    When I go to "/backend.html"
+    Then I should see:
+      """
+      <div class="paragraph">
+      <p>xml</p>
+      </div>
+      <hr/>
+      <div class="imageblock">
+      <div class="content">
+      <img src="/images/tiger.gif" alt="tiger"/>
+      </div>
+      </div>
+      """
   Scenario: Rendering html with title and layout from front matter
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/hello-with-front-matter.html"
     Then I should see:
       """
@@ -315,7 +321,7 @@ Feature: AsciiDoc Support
       """
   Scenario: Ignoring files marked as ignored
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/ignored.html"
     Then I should see:
       """
@@ -323,15 +329,15 @@ Feature: AsciiDoc Support
       """
   Scenario: Publishing site information as AsciiDoc attributes
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/site-information.html"
-    Then I should see content matching %r{<p>site-root=.+/tmp/aruba/asciidoc-app</p>}
-    Then I should see content matching %r{<p>site-source=.+/tmp/aruba/asciidoc-app/source</p>}
-    Then I should see content matching %r{<p>site-destination=.+/tmp/aruba/asciidoc-app/build</p>}
-    Then I should see content matching %r{<p>site-environment=development</p>}
+    Then I should see content matching %r{<p>site-root=.+/tmp/aruba/asciidoc-pages-app</p>}
+    And I should see content matching %r{<p>site-source=.+/tmp/aruba/asciidoc-pages-app/source</p>}
+    And I should see content matching %r{<p>site-destination=.+/tmp/aruba/asciidoc-pages-app/build</p>}
+    And I should see content matching %r{<p>site-environment=development</p>}
   Scenario: Merging page data in front matter and AsciiDoc header
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/hello-with-mixed-page-data.html"
     Then I should see:
       """
@@ -349,8 +355,16 @@ Feature: AsciiDoc Support
       </html>
       """
+  Scenario: Parses value of page attribute as YAML data
+    Given the Server is running at "asciidoc-pages-app"
+    When I go to "/page-data.html"
+    Then I should see:
+      """
+      <pre>{"title"=>"Page Data", "v-chrarray"=>["a", "b", "c"], "v-dblquote"=>"\"", "v-empty"=>"", "v-false"=>false, "v-hash"=>{"a"=>"a", "b"=>"b", "c"=>"c"}, "v-null"=>nil, "v-num"=>1, "v-numarray"=>[1, 2, 3], "v-quote"=>"'", "v-true"=>true}</pre>
+      """
   Scenario: Promoting standard AsciiDoc attributes to page data
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/inspect-standard-page-data.html"
     Then I should see:
       """
@@ -363,7 +377,7 @@ Feature: AsciiDoc Support
       """
   Scenario: Honor time zone specified in revdate
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/page-with-date-at-zone.html"
     Then I should see:
       """
@@ -371,13 +385,13 @@ Feature: AsciiDoc Support
       """
   Scenario: Add application time zone to revdate when none specified
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       set :time_zone, 'MST'
       activate :asciidoc
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/page-with-date.html"
     Then I should see:
       """
@@ -385,7 +399,7 @@ Feature: AsciiDoc Support
       """
   Scenario: Including a file relative to source root
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/master.html"
     Then I should see:
       """
@@ -396,7 +410,7 @@ Feature: AsciiDoc Support
       """
   Scenario: Including a file relative to document in subdirectory
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/manual/index.html"
     Then I should see:
       """
@@ -412,12 +426,12 @@ Feature: AsciiDoc Support
       """
   Scenario: Including a file relative to document in subdirectory when base_dir is set to :source
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, base_dir: :source
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/manual/index.html"
     Then I should see:
       """
@@ -425,12 +439,12 @@ Feature: AsciiDoc Support
       """
   Scenario: Including a file relative to document in subdirectory when base_dir is set to app.source_dir
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, base_dir: app.source_dir
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/manual/index.html"
     Then I should see:
       """
@@ -438,13 +452,13 @@ Feature: AsciiDoc Support
       """
   Scenario: Linking to a sibling page with directory indexes activated
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc
       activate :directory_indexes
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/link-to-page/"
     Then I should see:
       """
@@ -452,14 +466,14 @@ Feature: AsciiDoc Support
       """
   Scenario: Linking to a sibling page with directory indexes activated and trailing slash disabled
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc
       activate :directory_indexes
       set :trailing_slash, false
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/link-to-page/"
     Then I should see:
       """
@@ -467,14 +481,14 @@ Feature: AsciiDoc Support
       """
   Scenario: Linking to a sibling page with directory indexes activated and strip index file disabled
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc
       activate :directory_indexes
       set :strip_index_file, false
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/link-to-page/"
     Then I should see:
       """
@@ -482,7 +496,7 @@ Feature: AsciiDoc Support
       """
   Scenario: Linking to an image
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/gallery.html"
     Then I should see:
       """
@@ -493,7 +507,7 @@ Feature: AsciiDoc Support
       """
   Scenario: Linking to an image with a custom imagesdir
-    Given the Server is running at "asciidoc-app"
+    Given the Server is running at "asciidoc-pages-app"
     When I go to "/custom-imagesdir.html"
     Then I should see:
       """
@@ -504,12 +518,12 @@ Feature: AsciiDoc Support
       """
   Scenario: Restoring imagesdir to value defined in page
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, attributes: %w(imagesdir=@)
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/custom-imagesdir.html"
     Then I should see:
       """
@@ -520,12 +534,12 @@ Feature: AsciiDoc Support
       """
   Scenario: Restoring imagesdir to default value
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, attributes: %w(imagesdir!)
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/custom-imagesdir.html"
     Then I should see:
       """
@@ -536,12 +550,12 @@ Feature: AsciiDoc Support
       """
   Scenario: Overriding imagesdir attribute in page with imagesdir configuration
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, attributes: %w(imagesdir=/img)
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/custom-imagesdir.html"
     Then I should see:
       """
@@ -552,32 +566,32 @@ Feature: AsciiDoc Support
       """
   Scenario: Configuring custom AsciiDoc attributes as Array
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, attributes: %w(bar=bar@ foo={bar}{baz})
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/custom-attribute.html"
     Then I should see "bar{baz}"
   Scenario: Configuring custom AsciiDoc attributes as Hash
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, attributes: { 'bar' => 'bar@', 'foo' => '{bar}{baz}' }
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/custom-attribute.html"
     Then I should see "bar{baz}"
   Scenario: Highlighting source code
-    Given a fixture app "asciidoc-app"
+    Given a fixture app "asciidoc-pages-app"
     And a file named "config.rb" with:
       """
       activate :asciidoc, attributes: %w(source-highlighter=html-pipeline)
       """
-    Given the Server is running at "asciidoc-app"
+    And the Server is running
     When I go to "/code.html"
     Then I should see:
       """