diff --git a/test/factories.rb b/test/factories.rb index 554138c..543ae5e 100644 --- a/test/factories.rb +++ b/test/factories.rb @@ -207,10 +207,12 @@ trait :amazon_s1 do name 'storage' more_attributes(JSON.parse '{"price_per_gb":"0.0300"}') + resource_type 'storage' end trait :amazon_s2 do name 'infrequentAccessStorage' more_attributes(JSON.parse '{"price_per_gb":"0.0125"}') + resource_type 'storage' end trait :google_c1 do @@ -224,6 +226,7 @@ trait :google_s1 do name 'CP-BIGSTORE-STORAGE' more_attributes(JSON.parse '{"price_per_month_gb":0.026}') + resource_type 'storage' end end diff --git a/test/integration/provider_stories_test.rb b/test/integration/provider_stories_test.rb index 41d1ecf..0778df3 100644 --- a/test/integration/provider_stories_test.rb +++ b/test/integration/provider_stories_test.rb @@ -3,10 +3,15 @@ class ProviderStoriesTest < ActionDispatch::IntegrationTest test 'listing providers' do amazon = create(:amazon_provider) + google = create(:google_provider) visit providers_path - assert page.has_content? 'Amazon' - # TODO: The provider price list does not show up at all using PhantomJS or Selenium Javascript driver - # assert page.has_content? 't2.nano' + assert page.has_content? amazon.name + assert page.has_content? 't2.nano' + assert page.has_content? 't2.micro' + assert page.has_no_content?('storage'), 'Only show compute resources' + + assert page.has_content? google.name + assert page.has_content? 'f1-micro' end end