reorganize test/test_helper.rb and features/env.rb files so that the …

…engine generator works better for engines outside of the adva-cms2 repository

should probably make things completely independend from hardcoded load paths

adva-blog/features/env.rb

@@ -1 +1,2 @@
-require File.expand_path('../../../adva-core/lib/testing/env', __FILE__)
+require File.expand_path('../../../features/env', __FILE__)
+

adva-blog/test/test_helper.rb

@@ -1 +1,3 @@
-require File.expand_path('../../../adva-core/test/test_helper', __FILE__)
+require File.expand_path('../../../test/test_helper', __FILE__)
+
+

adva-cache/features/env.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../adva-core/lib/testing/env', __FILE__)
+require File.expand_path('../../../features/env', __FILE__)
 
 # require Adva::Cache.root.join('lib/testing/test_helper')
 # World(TestHelper::Cache)

adva-cache/test/test_helper.rb

@@ -1 +1,3 @@
-require File.expand_path('../../../adva-core/test/test_helper', __FILE__)
+require File.expand_path('../../../test/test_helper', __FILE__)
+
+

adva-categories/features/env.rb

@@ -1,2 +1,2 @@
-require File.expand_path('../../../adva-core/lib/testing/env', __FILE__)
+require File.expand_path('../../../features/env', __FILE__)
 

adva-categories/test/test_helper.rb

@@ -1,3 +1,3 @@
-require File.expand_path('../../../adva-core/test/test_helper', __FILE__)
+require File.expand_path('../../../test/test_helper', __FILE__)
+
 
-require 'adva-categories'

adva-core/lib/adva/generators/engine.rb

@@ -4,14 +4,14 @@ module Adva
   module Generators
     class Engine < Rails::Generators::Base
       source_root File.expand_path('../templates/engine', __FILE__)
-      
+
       attr_reader :name
-      
+
       def initialize(name, options = {})
         @name = name
         super()
       end
-      
+
       def build
         empty_directory "adva-#{name}"
         template        "gemspec.erb", "adva-#{name}/adva-#{name}.gemspec"
@@ -31,15 +31,23 @@ def build
         empty_directory "adva-#{name}/db/migrate"
         template        'migration.rb.erb', "adva-#{name}/db/migrate/#{migration_timestamp}_adva_#{name}_create_tables.rb"
 
+        empty_directory "adva-#{name}/features"
+        template        'env.rb', "adva-#{name}/features/env.rb"
+        template        'feature.erb', "adva-#{name}/features/#{name}.feature"
+
         empty_directory "adva-#{name}/lib/adva"
         create_file     "adva-#{name}/lib/adva-#{name}.rb", "require 'adva/#{name}'"
         template        'engine.rb.erb', "adva-#{name}/lib/adva/#{name}.rb"
 
+        empty_directory "adva-#{name}/lib/testing"
+        create_file     "adva-#{name}/lib/paths.rb", "adva-#{name}/lib/step_definitions.rb"
+        template        'paths.rb.erb', "adva-#{name}/lib/testing/paths.rb"
+
         empty_directory "adva-#{name}/test"
         template        'all.rb', "adva-#{name}/test/all.rb"
         template        'test_helper.rb.erb', "adva-#{name}/test/test_helper.rb"
       end
-      
+
       protected
 
         def migration_timestamp
@@ -49,10 +57,10 @@ def migration_timestamp
         def table_name
           name.tableize
         end
-        
+
         def class_name
           name.camelize
         end
     end
   end
-end
+end

adva-core/lib/adva/generators/templates/engine/env.rb

@@ -0,0 +1,3 @@
+require File.expand_path('../../../features/env', __FILE__)
+
+

adva-core/lib/adva/generators/templates/engine/feature.erb

@@ -0,0 +1,3 @@
+Feature: <%= name.titleize %>
+
+  Scenario:

adva-core/lib/adva/generators/templates/engine/paths.rb.erb

@@ -0,0 +1,12 @@
+module Adva::<%= name.classify %>::Paths
+  def path_to(page)
+    case page
+    when 'path/to/<%= name %>'
+    else
+      super
+    end
+  end
+end
+World(Adva::<%= name.classify %>::Paths)
+
+

adva-core/lib/adva/generators/templates/engine/test_helper.rb.erb

@@ -1,3 +1,3 @@
-require File.expand_path('../../../adva-core/test/test_helper', __FILE__)
+require File.expand_path('../../../test/test_helper', __FILE__)
 
 require 'adva-<%= name %>'

adva-core/lib/testing/helpers/global_helpers.rb

@@ -1,18 +1,20 @@
 module GlobalHelpers
-
   def site
     Site.first || raise("Could not find a site. Maybe you want to set one up in your story background?")
   end
 
+  def user
+    @user || raise("@current_user is not set. Maybe you want to sign in first?")
+  end
+
   def account
     Account.first || raise("Could not find a site. Maybe you want to set one up in your story background?")
   end
-  
+
   def parsed_html
     # memoizing this causes problems since it seems to be memoized across requests
     # TODO: Figure out way to memoize within one request only
     # @parsed_body ||= Nokogiri::HTML(response.body)
     Nokogiri::HTML(response.body)
   end
-
-end
+end

adva-core/test/test_helper.rb

@@ -32,4 +32,4 @@ def setup
   def teardown
     DatabaseCleaner.clean
   end
-end
+end

adva-markup/features/env.rb

@@ -1,2 +1,2 @@
-require File.expand_path('../../../adva-core/lib/testing/env', __FILE__)
+require File.expand_path('../../../features/env', __FILE__)
 

adva-markup/test/test_helper.rb

@@ -1,3 +1,3 @@
-require File.expand_path('../../../adva-core/test/test_helper', __FILE__)
+require File.expand_path('../../../test/test_helper', __FILE__)
+
 
-require 'adva-markup'

adva-static/features/env.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../adva-core/lib/testing/env', __FILE__)
+require File.expand_path('../../../features/env', __FILE__)
 
 require Adva::Static.root.join('lib/testing/test_helper')
 World(TestHelper::Static)

adva-static/test/test_helper.rb

@@ -1 +1,2 @@
-require File.expand_path('../../../adva-core/test/test_helper', __FILE__)
+require File.expand_path('../../../test/test_helper', __FILE__)
+

adva-user/features/env.rb

@@ -1,2 +1,2 @@
-require File.expand_path('../../../adva-core/lib/testing/env', __FILE__)
+require File.expand_path('../../../features/env', __FILE__)
 

adva-user/lib/testing/step_definitions.rb

@@ -1,5 +1,6 @@
 Given /^I am signed in with "([^"]*)" and "([^"]*)"$/ do |email, password|
   post user_session_path, :user => { :email => email, :password => password }
+  @user = User.find_by_email(email)
 end
 
 # This step should only be used for testing the login itself (login.feature)
@@ -10,6 +11,7 @@
   fill_in 'Email', :with => email
   fill_in 'Password', :with => password
   click_button 'Sign in'
+  @user = User.find_by_email(email)
 end
 
 Given /a confirmed user with email "([^"]+)" and password "([^"]+)"/ do |email, password|

features/env.rb

@@ -0,0 +1,2 @@
+require File.expand_path('../../adva-core/lib/testing/env', __FILE__)
+

test/test_helper.rb

@@ -0,0 +1,3 @@
+require File.expand_path('../../adva-core/test/test_helper', __FILE__)
+
+