Commit 481e549f by lanrion

Merge pull request #33 from lanrion/upgrade-reids-rb-to-fix-Redis-InheritedError

Upgrade reids rb to fix #8 redis inherited error
parents 1d6fbe28 85cee79f
...@@ -2,7 +2,7 @@ source 'https://rubygems.org' ...@@ -2,7 +2,7 @@ source 'https://rubygems.org'
group :test, :development do group :test, :development do
gem "rspec", "~> 3.0.0.beta1" gem "rspec", "~> 3.0.0.beta1"
gem "redis-namespace", "~> 1.4.1" gem 'redis-namespace', '~> 1.5.1'
gem "rake", "~> 0.9.6" gem "rake", "~> 0.9.6"
gem 'simplecov', '~> 0.7.1', :require => false gem 'simplecov', '~> 0.7.1', :require => false
gem "codeclimate-test-reporter", require: nil gem "codeclimate-test-reporter", require: nil
......
...@@ -19,7 +19,7 @@ describe WeixinAuthorize::Api::Media do ...@@ -19,7 +19,7 @@ describe WeixinAuthorize::Api::Media do
end end
let(:remote_png_path) do let(:remote_png_path) do
"http://l.ruby-china.org/user/large_avatar/273.png" "https://ruby-china-files.b0.upaiyun.com/user/big_avatar/273.jpg"
end end
let(:remote_jpg_path) do let(:remote_jpg_path) do
......
...@@ -37,9 +37,10 @@ SimpleCov.start ...@@ -37,9 +37,10 @@ SimpleCov.start
ENV['CODECLIMATE_REPO_TOKEN'] = "c91fecbbd9e414e7cc3ad7a7d99207145de0ac65a3368de09e8c19295343d399" ENV['CODECLIMATE_REPO_TOKEN'] = "c91fecbbd9e414e7cc3ad7a7d99207145de0ac65a3368de09e8c19295343d399"
CodeClimate::TestReporter.start CodeClimate::TestReporter.start
ENV["APPID"]="wxe371e0960de5426a" # If you want test, change your weixin test profile
ENV["APPSECRET"]="572b93d3d20aea242692a804243a141b" ENV["APPID"]="wx986f04063d341d04"
ENV["OPENID"]="oEEoyuEasxionjR5HygmEOQGwRcw" ENV["APPSECRET"]="1a941cd88cb4579ba98ec06b6813af03"
ENV["OPENID"]="o9k6BuB0kydAcPTc7sPxppB1GQqA"
# Comment to test for ClientStorage # Comment to test for ClientStorage
redis = Redis.new(:host => "127.0.0.1",:port => "6379") redis = Redis.new(:host => "127.0.0.1",:port => "6379")
......
...@@ -19,7 +19,7 @@ Gem::Specification.new do |spec| ...@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"] spec.require_paths = ["lib"]
spec.add_dependency "rest-client", ">= 1.6.7" spec.add_dependency "rest-client", ">= 1.6.7"
spec.add_dependency "redis", "~> 3.0.7" spec.add_dependency "redis", "~> 3.1.0"
spec.add_dependency "carrierwave", "~> 0.10.0" spec.add_dependency "carrierwave", "~> 0.10.0"
spec.add_dependency 'mini_magick', '~> 3.7.0' spec.add_dependency 'mini_magick', '~> 3.7.0'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment