Update to 3.5.0 or later

* Fix broken integration tests * Update to depend on 3.5.0 (not an RC version)
browsermedia · Jun 1, 2012 · 6ed09aa · 6ed09aa
1 parent 4baff75
commit 6ed09aa
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,6 @@
 source 'http://rubygems.org'
 
+gem 'rails', '3.2.3'
 gem 'sqlite3'
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    bcms_blog (1.3.0)
-      browsercms (>= 3.5.0.rc4, < 3.6.0)
+    bcms_blog (1.3.1)
+      browsercms (>= 3.5.0, < 3.6.0)
 
 GEM
   remote: http://rubygems.org/
@@ -37,7 +37,7 @@ GEM
     ancestry (1.2.5)
       activerecord (>= 2.2.2)
     arel (3.0.2)
-    browsercms (3.5.0.rc4)
+    browsercms (3.5.0)
       ancestry (~> 1.2.4)
       ckeditor_rails (~> 3.6.2.2)
       jquery-rails (~> 2.0)
@@ -129,4 +129,5 @@ DEPENDENCIES
   bcms_blog!
   factory_girl_rails
   mocha
+  rails (= 3.2.3)
   sqlite3
diff --git a/bcms_blog.gemspec b/bcms_blog.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.test_files += Dir["test/**/*"]
   s.test_files -= Dir['test/dummy/**/*']
 
-  s.add_dependency("browsercms", "< 3.6.0", ">= 3.5.0.rc4")
+  s.add_dependency("browsercms", "< 3.6.0", ">= 3.5.0")
 
 
 end

diff --git a/doc/release_notes.txt b/doc/release_notes.txt
@@ -1,3 +1,9 @@
+v1.3.1
+======
+
+* Fix bug with PostsPortlet where it was throwing an error when rendering
+* Fix broken integration tests
+
 v1.3.0
 ======
 

diff --git a/lib/bcms_blog/version.rb b/lib/bcms_blog/version.rb
@@ -1,3 +1,3 @@
 module BcmsBlog
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end
diff --git a/test/dummy/app/views/layouts/templates/default.html.erb b/test/dummy/app/views/layouts/templates/default.html.erb
@@ -4,7 +4,10 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <title><%= page_title %></title>
     <%= yield :html_head %>
+<% # Need this so integration tests don't break
+ if BcmsBlog::Blog.find_by_name("Patricks Blog") %>
 	<%= feeds_link_tag_for "Patricks Blog" %>
+<% end	%>
 
   </head>
   <body style="margin: 0; padding: 0; text-align: center;">