Permalink
Browse files

fixed rspec error.

  • Loading branch information...
1 parent e0bb0e1 commit 2b8fad01185e536d26485b2ebc02945ec61e1095 @saberma saberma committed Feb 1, 2012
View
4 spec/controllers/admin/emails_controller_spec.rb
@@ -86,7 +86,7 @@
title.should include '订单 #9999 发货提醒'
body.should include '尊敬的马海波'
body.should include '1 x iphone4'
- body.should include '通过 EMS 发送到以下地址'
+ body.should include '通过 顺丰快递 发送到以下地址'
body.should include '收货人信息: 马海波'
body.should include '广东省 深圳市 南山区 科技园南区6栋311'
body.should include '运单号为: 1234' # TODO:显示物流查询链接
@@ -103,7 +103,7 @@
body.should include '尊敬的马海波'
body.should include '您的订单号为#9999的商品更改了运送信息'
body.should include '1 x iphone4'
- body.should include '通过 EMS 运送'
+ body.should include '通过 顺丰快递 运送'
body.should include '运单号为 1234' # TODO:显示物流查询链接
title.should_not include 'Liquid error'
body.should_not include 'Liquid error'
View
6 spec/controllers/admin/weight_based_shipping_rates_controller_spec.rb
@@ -16,7 +16,7 @@
context '#create' do
it "success" do
expect do
- xhr :post, :create,weight_based_shipping_rate: {weight_low: 0.0, weight_high: 10.0, country_id: c.id, name: '顺风'}
+ xhr :post, :create,weight_based_shipping_rate: {weight_low: 0.0, weight_high: 10.0, country_id: c.id, name: '顺丰快递'}
end.should change(WeightBasedShippingRate,:count).by(1)
end
@@ -29,10 +29,10 @@
context "#edit" do
it "success" do
- put :update, weight_based_shipping_rate: { weight_low: 1.0, weight_high: 11.0,name: 'EMS', price: 20}, id: weight_based_shipping_rate.id
+ put :update, weight_based_shipping_rate: { weight_low: 1.0, weight_high: 11.0,name: '顺丰快递', price: 20}, id: weight_based_shipping_rate.id
response.should be_redirect
weight_based_shipping_rate.reload
- weight_based_shipping_rate.name.should eql 'EMS'
+ weight_based_shipping_rate.name.should eql '顺丰快递'
end
end
View
2 spec/requests/orders_spec.rb
@@ -90,7 +90,7 @@
click_on '发货' #发第二个商品
within '#batch_fulfillment_form' do
fill_in 'shipping_options[manual][tracking_number]', with: '789012'
- select '其他', from: 'shipping_options[manual][tracking_company]'
+ select '其它', from: 'shipping_options[manual][tracking_company]'
click_on '发货'
end
within '#unshipped-goods' do

0 comments on commit 2b8fad0

Please sign in to comment.