From 6fbb12c0fd1f304fe99feadbf2eeb8d3c1245d11 Mon Sep 17 00:00:00 2001 From: Gibheer Date: Mon, 17 Dec 2012 19:00:01 +0100 Subject: cleanup gemfile for jruby on travis --- Gemfile | 4 +- Gemfile.lock | 10 ++-- spec/unit/request/parameter/[]_spec.rb | 56 ---------------------- .../request/parameter/element_reference_spec.rb | 56 ++++++++++++++++++++++ zero.gemspec | 8 ++-- 5 files changed, 69 insertions(+), 65 deletions(-) delete mode 100644 spec/unit/request/parameter/[]_spec.rb create mode 100644 spec/unit/request/parameter/element_reference_spec.rb diff --git a/Gemfile b/Gemfile index 9039b30..06eb232 100644 --- a/Gemfile +++ b/Gemfile @@ -6,11 +6,13 @@ group :development do gem 'guard' gem 'guard-bundler' gem 'guard-rspec' + gem 'simplecov' gem 'yard' gem 'redcarpet' end group :test do gem 'thor' - gem 'simplecov' + gem 'rspec' + gem 'rack' end diff --git a/Gemfile.lock b/Gemfile.lock index f90b62e..92d6f93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,18 +24,19 @@ GEM lumberjack (1.0.2) method_source (0.8.1) multi_json (1.5.0) - pry (0.9.10) + pry (0.9.10-java) coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) + spoon (~> 0.0) rack (1.4.1) redcarpet (2.2.2) rspec (2.12.0) rspec-core (~> 2.12.0) rspec-expectations (~> 2.12.0) rspec-mocks (~> 2.12.0) - rspec-core (2.12.1) - rspec-expectations (2.12.0) + rspec-core (2.12.2) + rspec-expectations (2.12.1) diff-lcs (~> 1.1.3) rspec-mocks (2.12.0) simplecov (0.7.1) @@ -43,12 +44,13 @@ GEM simplecov-html (~> 0.7.1) simplecov-html (0.7.1) slop (3.3.3) + spoon (0.0.1) thor (0.16.0) tilt (1.3.3) yard (0.8.3) PLATFORMS - ruby + java DEPENDENCIES guard diff --git a/spec/unit/request/parameter/[]_spec.rb b/spec/unit/request/parameter/[]_spec.rb deleted file mode 100644 index 1136eae..0000000 --- a/spec/unit/request/parameter/[]_spec.rb +++ /dev/null @@ -1,56 +0,0 @@ -require 'spec_helper' - -describe Zero::Request::Parameter, '#[]' do - subject { Zero::Request::Parameter.new(env) } - - context 'without parameters' do - let(:env) { EnvGenerator.get('/foo') } - - it 'returns the custom parameter' do - subject['foo'] = 'bar' - expect(subject['foo']).to eq('bar') - end - end - - context 'with query parameters' do - let(:env) { EnvGenerator.get('/foo?foo=bar') } - - it 'returns the query parameter' do - expect(subject['foo']).to eq('bar') - end - - it 'returns the custom parameter' do - subject['foo'] = 'baz' - expect(subject['foo']).to eq('baz') - end - end - - context 'with payload parameters' do - let(:env) do - EnvGenerator.post('/foo', { - :input => 'foo=bar', 'CONTENT_TYPE' => 'multipart/form-data' - }) - end - - it 'returns the payload value' do - expect(subject['foo']).to eq('bar') - end - - it 'returns the custom parameter' do - subject['foo'] = 'baz' - expect(subject['foo']).to eq('baz') - end - end - - context 'with query and payload parameters' do - let(:env) do - EnvGenerator.post('/foo?foo=baz', { - :input => 'foo=bar', 'CONTENT_TYPE' => 'multipart/form-data' - }) - end - - it 'returns the payload parameter' do - expect(subject['foo']).to eq('bar') - end - end -end diff --git a/spec/unit/request/parameter/element_reference_spec.rb b/spec/unit/request/parameter/element_reference_spec.rb new file mode 100644 index 0000000..1136eae --- /dev/null +++ b/spec/unit/request/parameter/element_reference_spec.rb @@ -0,0 +1,56 @@ +require 'spec_helper' + +describe Zero::Request::Parameter, '#[]' do + subject { Zero::Request::Parameter.new(env) } + + context 'without parameters' do + let(:env) { EnvGenerator.get('/foo') } + + it 'returns the custom parameter' do + subject['foo'] = 'bar' + expect(subject['foo']).to eq('bar') + end + end + + context 'with query parameters' do + let(:env) { EnvGenerator.get('/foo?foo=bar') } + + it 'returns the query parameter' do + expect(subject['foo']).to eq('bar') + end + + it 'returns the custom parameter' do + subject['foo'] = 'baz' + expect(subject['foo']).to eq('baz') + end + end + + context 'with payload parameters' do + let(:env) do + EnvGenerator.post('/foo', { + :input => 'foo=bar', 'CONTENT_TYPE' => 'multipart/form-data' + }) + end + + it 'returns the payload value' do + expect(subject['foo']).to eq('bar') + end + + it 'returns the custom parameter' do + subject['foo'] = 'baz' + expect(subject['foo']).to eq('baz') + end + end + + context 'with query and payload parameters' do + let(:env) do + EnvGenerator.post('/foo?foo=baz', { + :input => 'foo=bar', 'CONTENT_TYPE' => 'multipart/form-data' + }) + end + + it 'returns the payload parameter' do + expect(subject['foo']).to eq('bar') + end + end +end diff --git a/zero.gemspec b/zero.gemspec index d1e663c..8673473 100644 --- a/zero.gemspec +++ b/zero.gemspec @@ -21,8 +21,8 @@ Gem::Specification.new do |s| s.add_dependency('tilt') - s.add_development_dependency('thor') - s.add_development_dependency('rack') - s.add_development_dependency('rspec') - s.add_development_dependency('simplecov') +# s.add_development_dependency('thor') +# s.add_development_dependency('rspec') +# s.add_development_dependency('rack') +# s.add_development_dependency('simplecov') end -- cgit v1.2.3-70-g09d2