seiten 0.0.4 → 0.0.5

data/test/dummy/tmp/pids/server.pid

@@ -1 +1 @@
-7523
+69184

data/test/integration/layout_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class LayoutTest < ActionDispatch::IntegrationTest
+
+  def test_returns_default_layout
+    visit "/about/works"
+    assert has_content?("Default Layout"), "not rendered default layout"
+  end
+
+  def test_returns_home_layout
+    visit "/"
+    assert has_content?("Home Layout"), "not rendered home layout"
+  end
+
+  def test_returns_inherited_layout
+    visit "/products/logo-design"
+    assert has_content?("Products Layout"), "not rendered inherited layout"
+  end
+
+  def test_returns_no_inherited_layout
+    visit "/about/our-team/switzerland"
+    assert has_content?("Default Layout"), "not rendered default layout"
+    visit "/contact"
+    assert has_content?("Default Layout"), "not rendered default layout"
+  end
+end

data/test/integration/navigation_test.rb

@@ -24,11 +24,6 @@ class NavigationTest < ActionDispatch::IntegrationTest
     assert !has_content?("Kreatify")
   end
 
-  def test_redirects_to_first_child_page
-    visit "/about"
-    assert_equal "/about/our-team", current_path
-  end
-
   def test_returns_sub_navigation
     visit "/about/partners"
     assert has_content?("Daniel Puglisi")
@@ -55,12 +50,6 @@ class NavigationTest < ActionDispatch::IntegrationTest
     assert_equal "/products/web-development", current_path
   end
 
-  def test_redirects_to_linked_page
-    visit "/"
-    click_link "Hire us"
-    assert_equal "/contact", current_path
-  end
-
   def test_returns_external_links
     visit "/about/partners"
     assert has_xpath?("//a[@href='http://danielpuglisi.com']")

data/test/integration/redirect_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class RedirectTest < ActionDispatch::IntegrationTest
+
+  def test_redirects_to_specified_page
+    visit "/"
+    click_link "Hire us"
+    assert_equal "/contact", current_path
+  end
+
+  def test_redirects_to_first_child_page
+    visit "/about"
+    assert_equal "/about/our-team", current_path
+  end
+end

data/test/page_test.rb

@@ -15,6 +15,10 @@ class PageTest < Test::Unit::TestCase
     assert_equal "/", Seiten::Page.find(1).slug
   end
 
+  def test_returns_page_layout
+    assert_equal "home", Seiten::Page.find(1).layout
+  end
+
   def test_returns_parent_page
     page = Seiten::Page.find(3)
     assert_equal Seiten::Page.find(2).title, page.parent.title

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: seiten
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Puglisi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :development
+        version: 3.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,9 @@ files:
 - test/dummy/app/pages/products/web-development.html.erb
 - test/dummy/app/pages/products.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/layouts/home.html.erb
+- test/dummy/app/views/layouts/products.html.erb
+- test/dummy/app/views/layouts/team.html.erb
 - test/dummy/app/views/pages/secret.html.erb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -122,7 +125,9 @@ files:
 - test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
 - test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
 - test/dummy/tmp/pids/server.pid
+- test/integration/layout_test.rb
 - test/integration/navigation_test.rb
+- test/integration/redirect_test.rb
 - test/page_test.rb
 - test/seiten_test.rb
 - test/test_helper.rb
@@ -167,6 +172,9 @@ test_files:
 - test/dummy/app/pages/products/web-development.html.erb
 - test/dummy/app/pages/products.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/layouts/home.html.erb
+- test/dummy/app/views/layouts/products.html.erb
+- test/dummy/app/views/layouts/team.html.erb
 - test/dummy/app/views/pages/secret.html.erb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -200,7 +208,9 @@ test_files:
 - test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
 - test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
 - test/dummy/tmp/pids/server.pid
+- test/integration/layout_test.rb
 - test/integration/navigation_test.rb
+- test/integration/redirect_test.rb
 - test/page_test.rb
 - test/seiten_test.rb
 - test/test_helper.rb