spec/support/feature_macros.rb in storytime-1.2.0 vs spec/support/feature_macros.rb in storytime-2.0.0

@@ -1,16 +1,21 @@
 module FeatureMacros
   def login(user = nil, skip_site = false)
-    setup_site unless skip_site
-    user ||= FactoryGirl.create(:writer)
-    visit main_app.new_user_session_path
+    user ||= FactoryGirl.create(:user)
+    unless skip_site
+      setup_site(user)
+      set_domain(@current_site.custom_domain)
+    end
     
+    visit main_app.new_user_session_path
+
     fill_in "user_email", :with => user.email
     fill_in "user_password", :with => user.password
     
-    click_on "Sign in"
-    page.should have_content("Signed in successfully.")
+    click_on "Log in"
+
+    expect(page).to have_content("Signed in successfully.")
     @current_user = user
   end
 
   def login_admin(admin = nil)
     login FactoryGirl.create(:admin)
@@ -30,13 +35,17 @@
 
   def current_site
     @current_site
   end
 
-  def setup_site
-    @current_site = FactoryGirl.create(:site)
+  def setup_site(user)
+    @current_site ||= FactoryGirl.create(:site)
+    @current_site.save_with_seeds(user)
+    @current_site.homepage = @current_site.blogs.first
+    @current_site.save
   end
 
-  def base_url
-    "http://#{Capybara.current_session.server.host}:#{Capybara.current_session.server.port}"
+  def have_link_to_post(post)
+    have_link(post.title, href: url_for([:edit, :dashboard, post, only_path: true]))
   end
+
 end