From ca68c7f944159921b83b770ccbdc5549d5b158d0 Mon Sep 17 00:00:00 2001 From: Eric Skogen Date: Thu, 1 Dec 2011 00:38:34 -0600 Subject: [PATCH 1/3] add failing test for a partial with a different engine than the layout --- features/partials.feature | 8 +++++++- fixtures/different-engine-partials/config.rb | 0 fixtures/different-engine-partials/source/index.html.erb | 1 + fixtures/different-engine-partials/source/layout.erb | 9 +++++++++ .../different-engine-partials/source/shared/footer.slim | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 fixtures/different-engine-partials/config.rb create mode 100644 fixtures/different-engine-partials/source/index.html.erb create mode 100644 fixtures/different-engine-partials/source/layout.erb create mode 100644 fixtures/different-engine-partials/source/shared/footer.slim diff --git a/features/partials.feature b/features/partials.feature index af9a2a27..15e380f8 100644 --- a/features/partials.feature +++ b/features/partials.feature @@ -32,4 +32,10 @@ Feature: Provide Sane Defaults for Partial Behavior Scenario: Partials can be passed locals Given the Server is running at "partials-app" When I go to "/locals.html" - Then I should see "Local var is bar" \ No newline at end of file + Then I should see "Local var is bar" + + Scenario: Partial and Layout of different engine + Given the Server is running at "different-engine-partial" + When I go to "/index.html" + Then I should see "Slim Footer" + \ No newline at end of file diff --git a/fixtures/different-engine-partials/config.rb b/fixtures/different-engine-partials/config.rb new file mode 100644 index 00000000..e69de29b diff --git a/fixtures/different-engine-partials/source/index.html.erb b/fixtures/different-engine-partials/source/index.html.erb new file mode 100644 index 00000000..a18c1a46 --- /dev/null +++ b/fixtures/different-engine-partials/source/index.html.erb @@ -0,0 +1 @@ +<%= partial 'shared/footer' %> \ No newline at end of file diff --git a/fixtures/different-engine-partials/source/layout.erb b/fixtures/different-engine-partials/source/layout.erb new file mode 100644 index 00000000..b72f66e9 --- /dev/null +++ b/fixtures/different-engine-partials/source/layout.erb @@ -0,0 +1,9 @@ + + + My Sample Site + + + + <%= yield %> + + \ No newline at end of file diff --git a/fixtures/different-engine-partials/source/shared/footer.slim b/fixtures/different-engine-partials/source/shared/footer.slim new file mode 100644 index 00000000..9b00bbf8 --- /dev/null +++ b/fixtures/different-engine-partials/source/shared/footer.slim @@ -0,0 +1 @@ +Slim Footer \ No newline at end of file From 721c2112e1a2983920cc1d7a207ce3481d9ffd92 Mon Sep 17 00:00:00 2001 From: Eric Skogen Date: Thu, 1 Dec 2011 00:39:50 -0600 Subject: [PATCH 2/3] clarify wording of test --- features/partials.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/partials.feature b/features/partials.feature index 15e380f8..b502b77f 100644 --- a/features/partials.feature +++ b/features/partials.feature @@ -34,7 +34,7 @@ Feature: Provide Sane Defaults for Partial Behavior When I go to "/locals.html" Then I should see "Local var is bar" - Scenario: Partial and Layout of different engine + Scenario: Partial and Layout use different engines Given the Server is running at "different-engine-partial" When I go to "/index.html" Then I should see "Slim Footer" From 5c07fd0ea915da83023b244f661e3c4049ef2eb3 Mon Sep 17 00:00:00 2001 From: Eric Skogen Date: Thu, 1 Dec 2011 02:35:40 -0600 Subject: [PATCH 3/3] fix typos in test for partials with engine different than layout --- features/partials.feature | 4 ++-- .../config.rb | 0 fixtures/different-engine-partial/source/index.html.erb | 1 + .../different-engine-partial/source/layouts/layout.erb | 4 ++++ fixtures/different-engine-partial/source/shared/_erb.erb | 1 + .../different-engine-partial/source/shared/_footer.slim | 1 + fixtures/different-engine-partials/source/index.html.erb | 1 - fixtures/different-engine-partials/source/layout.erb | 9 --------- .../different-engine-partials/source/shared/footer.slim | 1 - 9 files changed, 9 insertions(+), 13 deletions(-) rename fixtures/{different-engine-partials => different-engine-partial}/config.rb (100%) create mode 100644 fixtures/different-engine-partial/source/index.html.erb create mode 100644 fixtures/different-engine-partial/source/layouts/layout.erb create mode 100644 fixtures/different-engine-partial/source/shared/_erb.erb create mode 100644 fixtures/different-engine-partial/source/shared/_footer.slim delete mode 100644 fixtures/different-engine-partials/source/index.html.erb delete mode 100644 fixtures/different-engine-partials/source/layout.erb delete mode 100644 fixtures/different-engine-partials/source/shared/footer.slim diff --git a/features/partials.feature b/features/partials.feature index b502b77f..fad4ff0c 100644 --- a/features/partials.feature +++ b/features/partials.feature @@ -37,5 +37,5 @@ Feature: Provide Sane Defaults for Partial Behavior Scenario: Partial and Layout use different engines Given the Server is running at "different-engine-partial" When I go to "/index.html" - Then I should see "Slim Footer" - \ No newline at end of file + Then I should see "ERb Main" + And I should see "Slim Footer" diff --git a/fixtures/different-engine-partials/config.rb b/fixtures/different-engine-partial/config.rb similarity index 100% rename from fixtures/different-engine-partials/config.rb rename to fixtures/different-engine-partial/config.rb diff --git a/fixtures/different-engine-partial/source/index.html.erb b/fixtures/different-engine-partial/source/index.html.erb new file mode 100644 index 00000000..9f7cda8e --- /dev/null +++ b/fixtures/different-engine-partial/source/index.html.erb @@ -0,0 +1 @@ +Index \ No newline at end of file diff --git a/fixtures/different-engine-partial/source/layouts/layout.erb b/fixtures/different-engine-partial/source/layouts/layout.erb new file mode 100644 index 00000000..3065c6b2 --- /dev/null +++ b/fixtures/different-engine-partial/source/layouts/layout.erb @@ -0,0 +1,4 @@ +<%= partial 'shared/erb' %> +<%= partial 'shared/footer' %> + +<% yield %> \ No newline at end of file diff --git a/fixtures/different-engine-partial/source/shared/_erb.erb b/fixtures/different-engine-partial/source/shared/_erb.erb new file mode 100644 index 00000000..8003e446 --- /dev/null +++ b/fixtures/different-engine-partial/source/shared/_erb.erb @@ -0,0 +1 @@ +ERb Main \ No newline at end of file diff --git a/fixtures/different-engine-partial/source/shared/_footer.slim b/fixtures/different-engine-partial/source/shared/_footer.slim new file mode 100644 index 00000000..f80deb9e --- /dev/null +++ b/fixtures/different-engine-partial/source/shared/_footer.slim @@ -0,0 +1 @@ +footer Slim Footer \ No newline at end of file diff --git a/fixtures/different-engine-partials/source/index.html.erb b/fixtures/different-engine-partials/source/index.html.erb deleted file mode 100644 index a18c1a46..00000000 --- a/fixtures/different-engine-partials/source/index.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= partial 'shared/footer' %> \ No newline at end of file diff --git a/fixtures/different-engine-partials/source/layout.erb b/fixtures/different-engine-partials/source/layout.erb deleted file mode 100644 index b72f66e9..00000000 --- a/fixtures/different-engine-partials/source/layout.erb +++ /dev/null @@ -1,9 +0,0 @@ - - - My Sample Site - - - - <%= yield %> - - \ No newline at end of file diff --git a/fixtures/different-engine-partials/source/shared/footer.slim b/fixtures/different-engine-partials/source/shared/footer.slim deleted file mode 100644 index 9b00bbf8..00000000 --- a/fixtures/different-engine-partials/source/shared/footer.slim +++ /dev/null @@ -1 +0,0 @@ -Slim Footer \ No newline at end of file