nimbleshop_core 0.0.12 → 0.0.13

data/test/integration/admin/payment_methods_acceptance_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class PaymentMethodsAcceptanceTest < ActionDispatch::IntegrationTest
 
-  test "payment_methods when no payment method is configured" do
+  test "page should come up fine when no payment method is configured" do
     PaymentMethod.delete_all
     visit admin_path
     click_link 'Payment methods'
@@ -16,22 +16,22 @@ class PaymentMethodsControllerTest < ActionController::TestCase
 
   tests Admin::PaymentMethodsController
 
-  test "disable a payment method" do
+  test "disabling a payment method" do
     payment_method = PaymentMethod.first
     assert payment_method.enabled
 
     put :disable, id: payment_method.permalink
 
-    assert_redirected_to action: :index
+    assert_response :redirect
     refute payment_method.reload.enabled
   end
 
-  test "enable a payment method" do
+  test "enabling a payment method" do
     payment_method = PaymentMethod.first.tap {|r| r.update_attributes! enabled: false }
 
     put :enable, id: payment_method.permalink
 
-    assert_redirected_to action: :index
+    assert_response :redirect
     assert payment_method.reload.enabled
   end
 end

data/test/integration/admin/product_groups_acceptance_test.rb

@@ -83,7 +83,3 @@ class ProductGroupsAcceptanceTest < ActionDispatch::IntegrationTest
   end
 
 end
-
-
-
-

data/test/integration/admin/products_acceptance_test.rb

@@ -13,7 +13,7 @@ class ProductsAcceptanceTest < ActionDispatch::IntegrationTest
     fill_in 'Price', with: '45.99'
   end
 
-  test "should create a new product without image" do
+  test "creating a new product without image" do
     click_button 'Submit'
     assert_equal 0, Product.last.pictures.size
     assert_equal 0, page.all('ul.product_pictures li').count
@@ -21,6 +21,21 @@ class ProductsAcceptanceTest < ActionDispatch::IntegrationTest
     assert page.has_content?('the very wicked name for product')
   end
 
+  test "editing a product" do
+    create(:product, name: 'test')
+    visit admin_path
+    click_link 'Products'
+    click_link 'Edit'
+
+    fill_in 'Name', with: 'the very wicked name for product'
+    fill_in 'Description', with: 'test desc for user'
+    fill_in 'Price', with: '45.99'
+    click_button 'Submit'
+
+    assert page.has_content?('Successfully updated')
+    assert page.has_content?('the very wicked name for product')
+  end
+
   test 'editing a product with picture' do
     create :picture
     visit admin_path
@@ -30,7 +45,7 @@ class ProductsAcceptanceTest < ActionDispatch::IntegrationTest
     assert_equal 1, page.all('ul.product_pictures li').count
   end
 
-  test "should not create product with wrong params" do
+  test "product creation with wrong params" do
     visit admin_path
     click_link 'Products'
     click_link 'add_new_product'
@@ -48,38 +63,8 @@ class ProductsAcceptanceTest < ActionDispatch::IntegrationTest
     refute page.has_content?("Price can't be blank")
   end
 
-  test "should delete a product" do
-    create(:product, name: 'ipad99')
-    visit admin_path
-    click_link 'Products'
-    click_link 'Delete'
-    assert page.has_content?("Successfully deleted")
-    refute page.has_content?('ipad99')
-  end
-
-end
-
-class ProductsAcceptance2Test < ActionDispatch::IntegrationTest
-
-  setup do
+  test "product update with wrong params" do
     create(:product, name: 'test')
-  end
-
-  test "should edit a product" do
-    visit admin_path
-    click_link 'Products'
-    click_link 'Edit'
-
-    fill_in 'Name', with: 'the very wicked name for product'
-    fill_in 'Description', with: 'test desc for user'
-    fill_in 'Price', with: '45.99'
-    click_button 'Submit'
-
-    assert page.has_content?('Successfully updated')
-    assert page.has_content?('the very wicked name for product')
-  end
-
-  test "should not allow to save product with wrong params" do
     visit admin_path
     click_link 'Products'
     click_link 'Edit'
@@ -94,6 +79,15 @@ class ProductsAcceptance2Test < ActionDispatch::IntegrationTest
     assert page.has_content?("Price is not a number")
   end
 
+  test "deletion a product" do
+    create(:product, name: 'ipad99')
+    visit admin_path
+    click_link 'Products'
+    click_link 'Delete'
+    assert page.has_content?("Successfully deleted")
+    refute page.has_content?('ipad99')
+  end
+
   test "show product" do
     create(:product, name: 'ipad', description: 'the description', price: 46.99)
     visit admin_path
@@ -102,4 +96,5 @@ class ProductsAcceptance2Test < ActionDispatch::IntegrationTest
 
     assert page.has_content?("Edit product")
   end
+
 end

data/test/integration/admin/shipping_methods_acceptance_test.rb

@@ -6,7 +6,7 @@ class ShippingMethodAcceptanceTest < ActionDispatch::IntegrationTest
     create(:country_shipping_zone, country_code: code)
   end
 
-  test "add new shipping method to country" do
+  test "adding a new shipping method to country" do
     bef = ShippingZone.count
     shipping_zone = create_shipping_zone("US")
     visit new_admin_shipping_zone_shipping_method_path(shipping_zone)
@@ -17,20 +17,20 @@ class ShippingMethodAcceptanceTest < ActionDispatch::IntegrationTest
     fill_in "shipping_method_base_price", with: "10"
     click_button('Submit')
 
-    skip "builda fails but local tests pass" do
+    skip "travis ci fails but local tests pass" do
       assert_sanitized_equal 'Ground Shipping', find('table tr td').text
       assert_equal 58, ShippingZone.count - bef
     end
   end
 
-  test "edit shipping method to country" do
+  test "editing shipping method to country" do
     shipping_zone = create_shipping_zone("US")
     shipping_method = create(:country_shipping_method, shipping_zone: shipping_zone)
     visit edit_admin_shipping_zone_shipping_method_path(shipping_method.shipping_zone, shipping_method)
     fill_in "shipping_method_maximum_order_amount", with: "40"
     click_button('Submit')
 
-    skip "builda fails but local tests pass" do
+    skip "travis ci fails but local tests pass" do
       assert page.has_content?('Successfully updated')
     end
   end

data/test/integration/admin/shipping_zones_acceptance_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ShippingZonesAcceptanceTest < ActionDispatch::IntegrationTest
 
-  test "create new shipping zone and should add state level shipping methods" do
+  test "creating a new shipping zone and should add state level shipping methods" do
     visit admin_path
     click_link 'Shipping zones'
     click_link 'add_new_shipping_zone'

data/test/integration/admin/shops_acceptance_test.rb

@@ -6,7 +6,7 @@ class ShopsAcceptanceTest < ActionDispatch::IntegrationTest
     create(:shop)
   end
 
-  test "edit shop - good path" do
+  test "editing shop" do
     visit admin_path
     click_link 'Shop configuration'
     assert page.has_content?('Shop configuration')
@@ -22,7 +22,7 @@ class ShopsAcceptanceTest < ActionDispatch::IntegrationTest
     assert page.has_content?('Shop was successfully updated')
   end
 
-  test "edit shop - wrong path" do
+  test "editing shop with validtion error" do
     visit admin_path
     click_link 'Shop configuration'
     fill_in 'Name', with: ''

data/test/myshop/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.9'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

data/test/myshop/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Myshop::Application.config.secret_token = '35f935df4869aefccfb777ef9e0341d488bf6ff931eeb91117c998c3a070a6ace7bb7a62c719198f14e78dcc8d14885e2400ae56dbf8a80d82c04bb9e03f7ed4'
+Myshop::Application.config.secret_token = 'bc0970b5125bfa57ceee0e84eb09f0cc7a18118e2691ac637c3b0c48eef204911cd6f2394edff29d0851bd89f49ce5dc497c67dea2ddf0203b914a628800a1f8'

data/test/myshop/config/initializers/setup_email.rb

@@ -8,10 +8,10 @@ else
 
   ActionMailer::Base.delivery_method = :smtp
   ActionMailer::Base.smtp_settings = {
-    user_name:      Nimbleshop.config.mailtrapio.username,
-    password:       Nimbleshop.config.mailtrapio.password,
-    address:        "mailtrap.io",
-    port:           2525,
+    user_name:      Nimbleshop.config.mailtrap.username,
+    password:       Nimbleshop.config.mailtrap.password,
+    address:        Nimbleshop.config.mailtrap.address,
+    port:           Nimbleshop.config.mailtrap.port,
     authentication: :plain }
 
 end

data/test/myshop/config/nimbleshop.yml

@@ -24,9 +24,11 @@ common:
     secret_access_key: <%= ENV['S3_SECRET_ACCESS_KEY'] %>
     bucket_name:       <%= ENV['S3_BUCKET_NAME'] %>
 
-  mailtrapio:
+  mailtrap:
     username: <%= ENV['MAILTRAPIO_USERNAME'] || 'nimbleshop' %>
     password: <%= ENV['MAILTRAPIO_PASSWORD'] || 'f42c2934fbc2e229' %>
+    address:  mailtrap.railsware.com
+    port:     2525
 
 development:
   use_s3: false

data/test/myshop/db/migrate/{20121108022908_create_initial_tables.nimbleshop_core.rb → 20121129183432_create_initial_tables.nimbleshop_core.rb}

@@ -183,7 +183,6 @@ class CreateInitialTables < ActiveRecord::Migration
       t.string   "status",                                    :default => "active", :null => false
       t.text     "description"
       t.decimal  "price",       :precision => 8, :scale => 2,                       :null => false
-      t.boolean  "new",                                       :default => false,    :null => false
       t.string   "permalink",                                                       :null => false
       t.datetime "created_at",                                                      :null => false
       t.datetime "updated_at",                                                      :null => false

data/test/myshop/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121108022908) do
+ActiveRecord::Schema.define(:version => 20121129183432) do
 
   create_table "addresses", :force => true do |t|
     t.string   "type"
@@ -194,7 +194,6 @@ ActiveRecord::Schema.define(:version => 20121108022908) do
     t.string   "status",                                    :default => "active", :null => false
     t.text     "description"
     t.decimal  "price",       :precision => 8, :scale => 2,                       :null => false
-    t.boolean  "new",                                       :default => false,    :null => false
     t.string   "permalink",                                                       :null => false
     t.datetime "created_at",                                                      :null => false
     t.datetime "updated_at",                                                      :null => false