From d22bd914ae4a90a195fafc1f9b1f46b400e58950 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Fri, 18 Mar 2016 10:37:02 -0700 Subject: [PATCH] Add specific test for #1556 --- middleman-core/features/dynamic_pages.feature | 27 ++++++++++--------- .../fixtures/dynamic-pages-app/config.rb | 4 +++ .../source/should_be_ignored9.html | 1 + 3 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored9.html diff --git a/middleman-core/features/dynamic_pages.feature b/middleman-core/features/dynamic_pages.feature index 6d1b59ac..fc886ffd 100644 --- a/middleman-core/features/dynamic_pages.feature +++ b/middleman-core/features/dynamic_pages.feature @@ -31,7 +31,8 @@ Feature: Dynamic Pages | should_be_ignored6.html | | should_be_ignored7.html | | should_be_ignored8.html | - + | should_be_ignored9.html | + Scenario: Preview basic proxy Given the Server is running at "dynamic-pages-app" When I go to "/fake.html" @@ -42,46 +43,46 @@ Feature: Dynamic Pages Then I should see "I am real" When I go to "/fake4.html" Then I should see "I am real" - + Scenario: Preview proxy with variable one Given the Server is running at "dynamic-pages-app" When I go to "/fake/one.html" Then I should see "I am real: one" Then I should see "Global: I am one glob" Then I should see "All: I am all glob" - + When I go to "/fake2/one.html" Then I should see "I am real: one" Then I should see "Global: I am two glob" Then I should see "All: I am all glob" - + When I go to "/fake3/one.html" Then I should see "I am real: one" Then I should see "Global: I am three glob" Then I should see "All: I am all glob" - + When I go to "/fake4/one.html" Then I should see "I am real: one" Then I should see "Global: I am four glob" Then I should see "All: I am all glob" - + Scenario: Preview proxy with variable two Given the Server is running at "dynamic-pages-app" When I go to "/fake/two.html" Then I should see "I am real: two" Then I should see "Global: I am one glob" Then I should see "All: I am all glob" - + When I go to "/fake2/two.html" Then I should see "I am real: two" Then I should see "Global: I am two glob" Then I should see "All: I am all glob" - + When I go to "/fake3/two.html" Then I should see "I am real: two" Then I should see "Global: I am three glob" Then I should see "All: I am all glob" - + When I go to "/fake4/two.html" Then I should see "I am real: two" Then I should see "Global: I am four glob" @@ -101,7 +102,7 @@ Feature: Dynamic Pages Then the file "fake3/one.html" should contain "I am real: one" Then the file "fake3/one.html" should contain "Global: I am three glob" Then the file "fake3/one.html" should contain "All: I am all glob" - + Scenario: Target ignore Given the Server is running at "dynamic-pages-app" When I go to "/target_ignore.html" @@ -112,7 +113,7 @@ Feature: Dynamic Pages Then I should see "Ignore me! 7" When I go to "/target_ignore4.html" Then I should see "Ignore me! 8" - + Scenario: Preview ignored paths Given the Server is running at "dynamic-pages-app" When I go to "/should_be_ignored.html" @@ -130,4 +131,6 @@ Feature: Dynamic Pages When I go to "/should_be_ignored7.html" Then I should see "File Not Found" When I go to "/should_be_ignored8.html" - Then I should see "File Not Found" \ No newline at end of file + Then I should see "File Not Found" + When I go to "/should_be_ignored9.html" + Then I should see "File Not Found" diff --git a/middleman-core/fixtures/dynamic-pages-app/config.rb b/middleman-core/fixtures/dynamic-pages-app/config.rb index 75fab5e0..b195e0f9 100644 --- a/middleman-core/fixtures/dynamic-pages-app/config.rb +++ b/middleman-core/fixtures/dynamic-pages-app/config.rb @@ -28,3 +28,7 @@ page "fake/*", locals: { glob_var: "I am one glob" } page "fake2/*", locals: { glob_var: "I am two glob" } page "fake3/*", locals: { glob_var: "I am three glob" } page "fake4/*", locals: { glob_var: "I am four glob" } + +["tom", "dick", "harry"].each do |name| + proxy "/about/#{name}.html", "/should_be_ignored9.html", locals: { person_name: name }, ignore: true +end diff --git a/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored9.html b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored9.html new file mode 100644 index 00000000..53571d5e --- /dev/null +++ b/middleman-core/fixtures/dynamic-pages-app/source/should_be_ignored9.html @@ -0,0 +1 @@ +

Ignore me! 9