From 4a8a46ccc77b342f31ab60dafeb0b84ab538b190 Mon Sep 17 00:00:00 2001
From: Pete Higgins <pete@peterhiggins.org>
Date: Fri, 6 Jan 2012 11:33:13 -0800
Subject: The newest factory_girl apparently doesn't like how this worked.

---
 spec/spec_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ea550e2..9d4bffe 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -23,9 +23,9 @@ end
 def each_run  
   FactoryGirl.reload
   ActiveSupport::Dependencies.clear
-  
+
   load_all 'spec/support/**/*.rb'
-  load_all 'spec/factories/**/*.rb'
+  load_all 'spec/factories/**/*.rb' if FactoryGirl.factories.none?
 end
 
 # If spork is available in the Gemfile it'll be used but we don't force it.
-- 
cgit v1.2.3


From edfa8b81e793f071feb8af417930f9beb3fb806e Mon Sep 17 00:00:00 2001
From: Pete Higgins <pete@peterhiggins.org>
Date: Fri, 6 Jan 2012 11:36:27 -0800
Subject: Fix activity route generation. Workaround for
 resolve/refinerycms#1193.

---
 lib/refinery/blog/engine.rb           |  8 +++++++-
 spec/lib/refinery/blog/engine_spec.rb | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 spec/lib/refinery/blog/engine_spec.rb

diff --git a/lib/refinery/blog/engine.rb b/lib/refinery/blog/engine.rb
index 58e38f4..46ebea1 100644
--- a/lib/refinery/blog/engine.rb
+++ b/lib/refinery/blog/engine.rb
@@ -13,7 +13,13 @@ module Refinery
           plugin.url = app.routes.url_helpers.refinery_admin_blog_posts_path
           plugin.menu_match = /refinery\/blog\/?(posts|comments|categories)?/
           plugin.activity = {
-            :class_name => :'refinery/blog/post'
+            :class_name => :'refinery/blog/post',
+
+            # Workaround bug #1193 in refinerycms.
+            # Without this line, the route fragment generated by the Refinery's
+            # activity dashboard would be refinery_blog_admin_blog_posts_path,
+            # which does not exist.
+            :url => "refinery_admin_blog_posts_path"
           }
         end
       end
diff --git a/spec/lib/refinery/blog/engine_spec.rb b/spec/lib/refinery/blog/engine_spec.rb
new file mode 100644
index 0000000..5b36fd8
--- /dev/null
+++ b/spec/lib/refinery/blog/engine_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+module Refinery
+  module Blog
+    describe Engine do
+      let(:activity) do
+        Refinery::Plugins.registered.find_by_name("refinerycms_blog").activity.first
+      end
+
+      it "sets the correct path for activity entries" do
+        activity.url.should eq("edit_refinery_admin_blog_posts_path")
+      end
+    end
+  end
+end
-- 
cgit v1.2.3