keymail 0.3.0 → 0.3.1

data/test/dummy/test/controllers/auth_controller_test.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 
 describe AuthController do
 
+  let(:test_email) { 'test@email.com' }
+
   it 'renders the form' do
     get :new
     assert_template :new
@@ -13,16 +15,17 @@ describe AuthController do
   end
 
   it 'sends an email to the right address' do
-    test_email = 'test@email.com'
     post :request_email, email: test_email
+
     ActionMailer::Base.deliveries.wont_be :empty?
     ActionMailer::Base.deliveries.last.to.must_equal [test_email]
+
     assert_template :request_email
   end
 
   it 'redirects to success page with valid token' do
-    token = Factory :token
-    get :validate_link, url_key: token.url_key
+    get :validate_link, url_key: valid_token.url_key
+
     assert_redirected_to :success
   end
 
@@ -32,9 +35,16 @@ describe AuthController do
   end
 
   it 'redirects to error page with expired token' do
-    token = Factory :token, expires_at: 10.minutes.ago
-    get :validate_link, url_key: 'invalid_url_key'
+    get :validate_link, url_key: expired_token.url_key
     assert_redirected_to :fail
   end
 
+  def expired_token
+    Factory :token, expires_at: 1.second.ago
+  end
+
+  def valid_token
+    Factory :token
+  end
+
 end

data/test/integration/feature_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'pry'
 
 describe 'Feature Integration' do
 
@@ -24,6 +23,4 @@ describe 'Feature Integration' do
     page.must_have_content 'failed'
   end
 
-  # it 'logs in a user with an optional passcode'
-
 end

data/test/mailers/keymail/auth_mailer_test.rb

@@ -3,13 +3,16 @@ require 'test_helper'
 module Keymail
   describe AuthMailer do
 
-    let(:token) { Factory :token }
-    let(:emails) { ActionMailer::Base.deliveries }
-    let(:email) { emails.last }
-    let(:body) { email.body.raw_source }
+    let(:token)      { Factory :token }
+    let(:emails)     { ActionMailer::Base.deliveries }
+    let(:email)      { emails.last }
+    let(:body)       { email.body.raw_source }
+    let(:from_email) { 'test@email.com' }
 
     before do
       emails.clear
+      Keymail.config.from_email = from_email
+
       AuthMailer.log_in(token).deliver
     end
 
@@ -30,8 +33,7 @@ module Keymail
     end
 
     it 'sends from the configured from_email' do
-      # set in config/initializers/keymail_setup.rb
-      email.from.must_equal ['rails.keymail@gmail.com'] # FIXME: set this here
+      email.from.must_equal [from_email]
     end
 
   end

data/test/models/keymail/authentication_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 module Keymail
   describe Authentication do
     context '.request' do
-
       let(:email) { 'test@email.com' }
 
       it 'creates a new token' do
@@ -40,7 +39,7 @@ module Keymail
       end
 
       context 'authenticated' do
-        let(:token) { Factory :token }
+        let(:token)    { Factory :token }
         let(:response) { Authentication.verify_url_key(token.url_key) }
 
         it 'is authenticated' do
@@ -55,11 +54,10 @@ module Keymail
           response.wont_be :expired?
         end
 
-        # first time, redirect...
       end
 
       context 'expired' do
-        let(:token) { Factory :token, expires_at: 10.minutes.ago }
+        let(:token)    { Factory :token, expires_at: 10.minutes.ago }
         let(:response) { Authentication.verify_url_key(token.url_key) }
 
         it 'is not authenticated' do

data/test/models/keymail/token_test.rb

@@ -18,7 +18,7 @@ module Keymail
     end
 
     it 'is expired after its expiry date' do
-      token = Factory.build :token, expires_at: 10.minutes.ago
+      token = Factory.build :token, expires_at: 1.second.ago
       token.must_be :expired?
     end
   end

data/test/test_helper.rb

@@ -1,31 +1,27 @@
+# Code coverage
 require 'simplecov'
 require 'coveralls'
-
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
 SimpleCov.start 'rails'
 
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
 
+# Load rails
+ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
 
-require "factories"
 
-Turn.config.natural = true
+require "rails/test_help"
+require "factories"
 
-DatabaseCleaner.strategy = :transaction
 
-Rails.backtrace_cleaner.remove_silencers!
+Turn.config.natural = true
 
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 class Minitest::Spec
-  include ActiveSupport::Testing::Assertions # assert_difference etc...
+  include ActiveSupport::Testing::Assertions       # assert_difference etc...
   include ActiveSupport::Testing::SetupAndTeardown # before, after
 
   # Support rspec-style context-blocks
@@ -33,10 +29,12 @@ class Minitest::Spec
     alias_method :context, :describe
   end
 
+  DatabaseCleaner.strategy = :transaction
   before { DatabaseCleaner.start }
   after { DatabaseCleaner.clean }
 end
 
+
 # A bit more dry validation tests
 #     m = Message.create(text: '')
 #     m.must_have_invalid :text
@@ -48,12 +46,13 @@ module Minitest::Assertions
 end
 ActiveRecord::Base.infect_an_assertion :assert_has_invalid, :must_have_invalid
 
+
 class Proc
-    infect_an_assertion :assert_difference, :must_change
-    infect_an_assertion :assert_no_difference, :wont_change
+  infect_an_assertion :assert_difference, :must_change
+  infect_an_assertion :assert_no_difference, :wont_change
 end
 
-# Make the controller methods (get, post etc...) work
+
 class ControllerSpec < Minitest::Spec
   include Rails.application.routes.url_helpers
   include ActionController::TestCase::Behavior
@@ -64,7 +63,7 @@ class ControllerSpec < Minitest::Spec
 end
 Minitest::Spec.register_spec_type(/Controller$/, ControllerSpec)
 
-# Set up Capybara
+
 require 'capybara/rails'
 class AcceptanceSpec < MiniTest::Spec
   include Rails.application.routes.url_helpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keymail
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - alcesleo
@@ -24,8 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.4
-description: Instead of using passwords, keymail sends emails with a link that logs
-  in your user automatically.
+description: Instead of using passwords, keymail sends an email with a link that logs
+  your user in automatically.
 email:
 - lagginglion@gmail.com
 executables: []
@@ -44,8 +44,6 @@ files:
 - lib/keymail.rb
 - lib/keymail/engine.rb
 - lib/keymail/version.rb
-- lib/tasks/keymail_tasks.rake
-- test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/auth_controller.rb
@@ -122,7 +120,6 @@ signing_key:
 specification_version: 4
 summary: Forget passwords, authenticate via email!
 test_files:
-- test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/auth_controller.rb

data/lib/tasks/keymail_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :keymail do
-#   # Task goes here
-# end

data/test/dummy/README.rdoc

@@ -1,28 +0,0 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.