action_smser 3.0.0 → 3.1.0

data/test/functional/action_smser/delivery_reports_controller_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require './test/test_helper'
 
 class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
 
@@ -33,6 +33,7 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
 
   setup do
     ActionSmser.delivery_options[:gateway_commit_observers] = []
+    @routes = ActionSmser::Engine.routes
   end
 
   test "gateway_commit with existing dr" do
@@ -44,7 +45,7 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
 
     SmsTestSetup.expects(:after_gateway_commit).once.with(){|var| var.is_a?(Array) && var.first.is_a?(ActionSmser::DeliveryReport)}
 
-    get 'gateway_commit', :use_route => :action_smser, :gateway => 'test_gateway',
+    get 'gateway_commit', :gateway => 'test_gateway',
         "DeliveryReport"=>{"message"=>{"id"=>@msg_id, "donedate"=>"2012/01/03 14:20:45", "sentdate"=>"2012/01/03 14:20:40", "status"=>"DELIVERED"}}
 
 
@@ -62,7 +63,7 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
 
     ActionSmser.delivery_options[:gateway_commit] = {'test_gateway' => SmsTestSetup}
 
-    get 'gateway_commit', :use_route => :action_smser, :gateway => 'test_gateway',
+    get 'gateway_commit', :gateway => 'test_gateway',
         "DeliveryReport"=>
             {"message"=>[{"id"=>@msg_id.to_s, "status"=>"DELIVERED"},
                          {"id"=>@msg_id2, "status"=>"DELIVERED"}]}
@@ -80,7 +81,7 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
   test "gateway_commit without dr" do
     ActionSmser.delivery_options[:gateway_commit] = {'test_gateway' => SmsTestSetup}
 
-    get 'gateway_commit', :use_route => :action_smser, :gateway => 'test_gateway',
+    get 'gateway_commit', :gateway => 'test_gateway',
         "DeliveryReport"=>{"message"=>{"id"=>"wrongid", "donedate"=>"2012/01/03 14:20:45", "sentdate"=>"2012/01/03 14:20:40", "status"=>"DELIVERED"}}
 
     assert_response :success
@@ -88,7 +89,7 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
   end
 
   test "gateway_commit without any parser" do
-    get 'gateway_commit', :use_route => :action_smser, :gateway => 'gateway_not_found',
+    get 'gateway_commit', :gateway => 'gateway_not_found',
         "DeliveryReport"=>{"message"=>{"id"=>"wrongid", "donedate"=>"2012/01/03 14:20:45", "sentdate"=>"2012/01/03 14:20:40", "status"=>"DELIVERED"}}
 
     assert_response :success
@@ -97,7 +98,7 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
 
 
   test "index with forbidden admin_access (default access mode)" do
-    get 'index', :use_route => :action_smser
+    get 'index'
     assert_response 403
     assert_template nil
   end
@@ -109,7 +110,7 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
       ActionSmser::DeliveryReport.create(:msg_id => "idtest_#{rand(10)}")
     end
     session[:admin_logged] = true
-    get 'index', :use_route => :action_smser
+    get 'index'
 
     assert_response :success
     assert_template :index
@@ -124,7 +125,7 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
       ActionSmser::DeliveryReport.create(:msg_id => "idtest_#{rand(10)}")
     end
     ActionSmser::DeliveryReportsController.any_instance.stubs(:admin_access_only).returns(true)
-    get 'index', :use_route => :action_smser
+    get 'index'
     assert_response :success
     assert_template :index
   end
@@ -134,7 +135,7 @@ class ActionSmser::DeliveryReportsControllerTest < ActionController::TestCase
       ActionSmser::DeliveryReport.create(:msg_id => "idtest_#{rand(10)}")
     end
     ActionSmser::DeliveryReportsController.any_instance.stubs(:admin_access_only).returns(true)
-    get 'list', :use_route => :action_smser
+    get 'list'
     assert_response :success
     assert_template :list
   end

data/test/integration/navigation_test.rb

@@ -4,7 +4,7 @@ class NavigationTest < ActionDispatch::IntegrationTest
   fixtures :all
 
   test "basic gateway_commit delivery_report" do
-    get 'action_smser/delivery_reports/gateway_commit/example_gateway'
+    get '/action_smser/delivery_reports/gateway_commit/example_gateway'
     assert_response :success
   end
 end

data/test/test_helper.rb

@@ -6,17 +6,18 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require 'minitest/mock'
+require "mocha/setup"
 
 Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
-
-silence_stream(STDOUT) do
-  ActiveRecord::Migrator.migrate File.expand_path('../../db/migrate/', __FILE__)
-end
+#ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+#
+#silence_stream(STDOUT) do
+#  ActiveRecord::Migrator.migrate File.expand_path('../../db/migrate/', __FILE__)
+#end
 
 #def drop_all_tables
 #  ActiveRecord::Base.connection.tables.each do |table|

data/test/unit/action_smser/base_test.rb

@@ -18,14 +18,14 @@ class ActionSmser::BaseTest < ActiveSupport::TestCase
   end
 
   setup do
-    @receivers = ["555123555", "123", "+358123555123"]
+    @receivers = ["555123555", "123", "+358123555123", "004915112341234", "04917332341111"]
     @sender = "555666"
     @body = "Body with ääkköset end"
     @sms = MockSms.basic_sms(@receivers, @sender, @body)
   end
 
   test "receivers should be joined by commas" do
-    assert_equal "555123555,123,358123555123", @sms.to_encoded
+    assert_equal "555123555,123,358123555123,4915112341234,4917332341111", @sms.to_encoded
   end
 
   test "should be ok with single receivers" do

data/test/unit/action_smser/delivery_methods/smstrade_test.rb

@@ -29,6 +29,21 @@ class ActionSmser::SmstradeTest < ActiveSupport::TestCase
     assert_equal 2, @sms_delivery.count
   end
 
+  test "should only receive numbers not prepended with zeros or plus signs" do
+    prepended_receivers = ["004915112341234", "+4917812341234", "04917332341111"]
+    sms = MockSms.basic_sms(prepended_receivers, @sender, @body)
+
+    assert_equal ["4915112341234", "4917812341234", "4917332341111"], sms.to_numbers_array
+  end
+
+  test "should append 00 to phone numbers before sending" do
+    @receivers.each do |to|
+      ActionSmser::DeliveryMethods::Smstrade.expects(:deliver_path).with(anything(), "00#{to}", anything())
+    end
+
+    sms_delivery = @sms.deliver
+  end
+
   test "with saving delivery_reports" do
     @sms.delivery_options[:save_delivery_reports] = true
     @delivery_reports_count = ActionSmser::DeliveryReport.count
@@ -44,10 +59,10 @@ class ActionSmser::SmstradeTest < ActiveSupport::TestCase
 
     @dr1 = @sms_delivery.first
     assert_equal "smstrade", @dr1.gateway
-    assert_equal "4915112341234", @dr1.to, "receiver wrong"
+    assert_equal "004915112341234", @dr1.to, "receiver wrong"
     assert_equal "LOCAL_SENT", @dr1.status
 
     @dr2 = @sms_delivery.last
-    assert_equal "4917812341234", @dr2.to, "receiver wrong"
+    assert_equal "004917812341234", @dr2.to, "receiver wrong"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_smser
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Olli Huotari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -141,9 +141,11 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/secrets.yml
 - test/dummy/db/development.sqlite3
 - test/dummy/db/production.sqlite3
 - test/dummy/db/schema.rb
+- test/dummy/db/tes
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/production.log
@@ -183,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ActionSmser == SMS && ActionMailer. Simple way to use SMS (Short Message
@@ -210,6 +212,7 @@ test_files:
 - test/dummy/public/404.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
+- test/dummy/db/tes
 - test/dummy/db/production.sqlite3
 - test/dummy/db/development.sqlite3
 - test/dummy/db/test.sqlite3
@@ -231,6 +234,7 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/application.rb
+- test/dummy/config/secrets.yml
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/environments/production.rb