Hey,
These are just some misc small patches, mostly related to the tests.
Cheers, Mark.
--- .gitignore | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore index 381cd83..827f787 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,3 @@ src/public/stylesheets/compiled development.sqlite3 production.sqlite3 test.sqlite3 - -# the search index generated by Solr -src/solr/data
0.5.0 is what's in F14 and the tests pass with it. --- src/config/environments/cucumber.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/config/environments/cucumber.rb b/src/config/environments/cucumber.rb index c1bd610..f810f45 100644 --- a/src/config/environments/cucumber.rb +++ b/src/config/environments/cucumber.rb @@ -22,7 +22,7 @@ config.action_controller.allow_forgery_protection = false config.action_mailer.delivery_method = :test
config.gem 'cucumber-rails', :lib => false, :version => '~>0.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails')) -config.gem 'database_cleaner', :lib => false, :version => '~>0.5.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner')) +config.gem 'database_cleaner', :lib => false, :version => '~>0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner')) config.gem 'webrat', :lib => false, :version => '~>0.7.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) config.gem 'rspec', :lib => false, :version => '~>1.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) config.gem 'rspec-rails', :lib => false, :version => '~>1.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
--- src/config/environments/cucumber.rb | 5 ++++- src/config/environments/test.rb | 2 ++ 2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/config/environments/cucumber.rb b/src/config/environments/cucumber.rb index f810f45..743fd76 100644 --- a/src/config/environments/cucumber.rb +++ b/src/config/environments/cucumber.rb @@ -26,4 +26,7 @@ config.gem 'database_cleaner', :lib => false, :version => '~>0.5.0' unless File. config.gem 'webrat', :lib => false, :version => '~>0.7.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat')) config.gem 'rspec', :lib => false, :version => '~>1.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec')) config.gem 'rspec-rails', :lib => false, :version => '~>1.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) -config.gem "factory_girl", :lib => "factory_girl", :version => "~>1.3.1" + +config.gem "factory_girl", :lib => "factory_girl", :version => "~>1.3.1" +config.gem 'vcr', :lib => 'vcr', :version => '>= 1.10.0' +config.gem 'webmock', :lib => 'webmock', :version => '>= 1.6.4' diff --git a/src/config/environments/test.rb b/src/config/environments/test.rb index f7981c4..42ed90f 100644 --- a/src/config/environments/test.rb +++ b/src/config/environments/test.rb @@ -40,3 +40,5 @@ config.action_mailer.delivery_method = :test config.gem 'rspec-rails', :version => '>= 1.3.2', :lib => false unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails')) config.gem "factory_girl", :lib => "factory_girl", :version => ">=1.3.1" config.gem 'timecop', :lib => 'timecop', :version => '>= 0.3.5' +config.gem 'vcr', :lib => 'vcr', :version => '>= 1.10.0' +config.gem 'webmock', :lib => 'webmock', :version => '>= 1.6.4'
Both aeolus-configure and the Development_Setup wiki page use port 3002 for the mock provider, so there doesn't appear to be a good reason to require it on 3001 for the tests. --- src/features/provider.feature | 8 ++++---- src/spec/factories/provider.rb | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/features/provider.feature b/src/features/provider.feature index ef89ea5..78f4de8 100644 --- a/src/features/provider.feature +++ b/src/features/provider.feature @@ -35,9 +35,9 @@ Feature: Manage Providers And each provider should have "provider_type" And there should be these provider: | name | url | provider_type | - | provider1 | http://localhost:3001/api | mock | - | provider2 | http://localhost:3001/api | mock | - | provider3 | http://localhost:3001/api | mock | + | provider1 | http://localhost:3002/api | mock | + | provider2 | http://localhost:3002/api | mock | + | provider3 | http://localhost:3002/api | mock |
Scenario: Show provider details Given there is a provider named "testprovider" @@ -52,7 +52,7 @@ Feature: Manage Providers When I follow "New Provider" Then I should be on the new provider page When I fill in "provider[name]" with "testprovider" - And I fill in "provider[url]" with "http://localhost:3001/api" + And I fill in "provider[url]" with "http://localhost:3002/api" And I select "Amazon EC2" from "provider_provider_type_id" And I press "Save" Then I should be on the providers page diff --git a/src/spec/factories/provider.rb b/src/spec/factories/provider.rb index 243a7e4..6fef60b 100644 --- a/src/spec/factories/provider.rb +++ b/src/spec/factories/provider.rb @@ -6,7 +6,7 @@ end
Factory.define :mock_provider, :parent => :provider do |p| p.provider_type {ProviderType.find_by_codename("mock")} - p.url 'http://localhost:3001/api' + p.url 'http://localhost:3002/api' p.hardware_profiles { |hp| [hp.association(:mock_hwp1), hp.association(:mock_hwp2)] } p.after_create { |p| p.realms << Factory(:realm1, :provider => p) << Factory(:realm2, :provider => p) } end @@ -14,14 +14,14 @@ end Factory.define :mock_provider2, :parent => :provider do |p| p.name 'mock2' p.provider_type { ProviderType.find_by_codename("mock") } - p.url 'http://localhost:3001/api' + p.url 'http://localhost:3002/api' p.after_create { |p| p.realms << Factory(:realm3, :provider => p) } end
Factory.define :ec2_provider, :parent => :provider do |p| p.name 'amazon-ec2' p.provider_type { ProviderType.find_by_codename("ec2") } - p.url 'http://localhost:3001/api' + p.url 'http://localhost:3002/api' p.hardware_profiles { |hp| [hp.association(:ec2_hwp1)] } p.after_create { |p| p.realms << Factory(:realm4, :provider => p) } end
On 07/26/2011 04:10 PM, Mark McLoughlin wrote:
Hey,
These are just some misc small patches, mostly related to the tests.
Cheers, Mark. _______________________________________________ aeolus-devel mailing list aeolus-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/aeolus-devel
ACK to patches 1-3.
I pushed my version of the fourth patch that you acked. Sorry again for not noticing yours sooner.
Thomas
aeolus-devel@lists.fedorahosted.org