fixing tests

lib/s3-upnow.rb

@@ -8,7 +8,4 @@
 require 's3-upnow/config_aws'
 require 's3-upnow/form_helper'
 require 's3-upnow/engine' if defined?(Rails)
-require 's3-upnow/railtie' if defined?(Rails)
-
-ActionView::Base.send(:include, S3UpNow::S3UpNowHelper) if defined?(ActionView::Base)
-ActionView::Helpers::FormBuilder.send(:include, S3UpNow::S3UpNowFieldHelper)
+require 's3-upnow/railtie' if defined?(Rails)

lib/s3-upnow/engine.rb

@@ -1,4 +1,8 @@
 module S3UpNow
   class Engine < ::Rails::Engine 
+    initializer "s3-upnow.setup", before: :load_environment_config do
+      ActionView::Base.send(:include, S3UpNow::S3UpNowHelper) if defined?(ActionView::Base)
+      ActionView::Helpers::FormBuilder.send(:include, S3UpNow::S3UpNowFieldHelper)
+    end
   end
 end

spec/existance_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 describe S3UpNow do
   it "version must be defined" do
-    S3UpNow::VERSION.should be_true
+    expect(S3UpNow::VERSION).to be
   end
 
   it "config must be defined" do
-    S3UpNow.config.should be_true
+    expect(S3UpNow.config).to be
   end
 
 end

spec/generator_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe S3UpNow::Generator do
+  describe "policy_data" do
+    describe "starts-with $key" do
+      it "is configurable with the key_starts_with option" do
+        key_starts_with = "uploads/"
+        generator = S3UpNow::Generator.new({:key_starts_with => key_starts_with})
+        expect(generator.policy_data[:conditions]).to include ["starts-with", "$key", key_starts_with]
+      end
+
+      it "defaults to 'uploads/'" do
+        generator = S3UpNow::Generator.new({})
+        expect(generator.policy_data[:conditions]).to include ["starts-with", "$key", "uploads/"]
+      end
+    end
+
+    describe "starts-with $content-type" do
+      it "is configurable with the content_type_starts_with option" do
+        content_type_starts_with = "image/"
+        generator = S3UpNow::Generator.new({:content_type_starts_with => content_type_starts_with})
+        expect(generator.policy_data[:conditions]).to include ["starts-with", "$content-type", content_type_starts_with]
+      end
+
+      it "is defaults to an empty string" do
+        generator = S3UpNow::Generator.new({})
+        expect(generator.policy_data[:conditions]).to include ["starts-with", "$content-type", ""]
+      end
+    end
+  end
+end

spec/spec_helper.rb

@@ -2,7 +2,6 @@
 require 's3-upnow'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus