Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts: vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb
This commit is contained in:
Matthew K. Fu JuYuan committed
commit
664c6d2f61
68 files changed
+1393
-572
No files matched your search
@@ -0,0 +1,12 @@
|
||||
require 'spec_helper'
|
||||
describe AttributeField do
|
||||
describe "#list field" do
|
||||
context "when field is in type text_field(without add more)" do
|
||||
before(:each) do
|
||||
@attribute_field = AttributeField.new(:key=>'test',:markup=>"text_field")
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,63 @@
|
||||
#encoding: UTF-8
|
||||
require 'spec_helper'
|
||||
|
||||
describe AttributeValue do
|
||||
describe "#attribute_value" do
|
||||
context "Data should be able to input and out put as aspect"
|
||||
|
||||
before(:each) do
|
||||
@af = AttributeField.find '5052cf9f2b5c49a742000005'
|
||||
@user = User.where(email:'chris@rulingcom.com').first
|
||||
@av = AttributeValue.last
|
||||
end #end before
|
||||
|
||||
|
||||
[true,false].each do |locale_sat|
|
||||
LIST[:markups].each do |markup|
|
||||
@av = nil
|
||||
it "[#{markup[0]}]Input: should save data at right way when local is set to #{locale_sat}" do
|
||||
@af.markup = markup[0]
|
||||
@av = nil
|
||||
@input_value = assume_result = case markup[0]
|
||||
when 'text_field','text_area'
|
||||
(locale_sat ? {"en"=> "lalala","zh_tw"=>"拉拉拉"} : "hahaha")
|
||||
when 'select','radio_button'
|
||||
"1"
|
||||
when 'date'
|
||||
{"(1i)"=>Date.today.year.to_s,"(2i)"=>Date.today.month.to_s,"(3i)"=>Date.today.day.to_s}
|
||||
when 'checkbox'
|
||||
{"1"=>"true", "3"=>"true"}
|
||||
end #end of case
|
||||
assume_result = ["1","3"] if markup[0] == 'checkbox'
|
||||
@af.locale = locale_sat
|
||||
@af.save
|
||||
@data_hash = {"attribute_field_id" => @af.id,"value" => @input_value}
|
||||
@av = @user.attribute_values.build(@data_hash)
|
||||
@av.save
|
||||
@av.value.should == assume_result
|
||||
# @av.destroy
|
||||
end
|
||||
|
||||
it "[#{markup[0]}]Output(just for show): should output data at right way when local is set to #{locale_sat}" do
|
||||
locale = I18n.locale
|
||||
assume_result = case markup[0]
|
||||
when 'text_area'
|
||||
(locale_sat ? "拉拉拉" : "hahaha")
|
||||
when 'text_field'
|
||||
(locale_sat ? "拉拉拉" : "hahaha")
|
||||
when 'select','radio_button'
|
||||
(locale_sat ? "男性" : "男性")
|
||||
when 'date'
|
||||
Date.today
|
||||
when 'checkbox'
|
||||
(locale_sat ? "男性,不公開" : "男性,不公開")
|
||||
end #end of case
|
||||
|
||||
@av.get_value_by_locale(locale).should == assume_result
|
||||
end
|
||||
|
||||
end #end of LIST loop
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
Reference in new issue
Block a user