From 76c9c42070af646458b13d06b9b57f57e679f0de Mon Sep 17 00:00:00 2001 From: yasushiito Date: Sat, 16 Jun 2012 12:26:05 +0900 Subject: [PATCH] pass test --- app/controllers/panels_controller.rb | 23 +- app/models/artist.rb | 5 +- app/models/balloon.rb | 2 +- app/models/panel.rb | 86 +- app/models/speech.rb | 2 +- app/models/speech_balloon.rb | 2 +- app/views/original_licenses/result.html.erb | 10 + app/views/panels/list.html.erb | 2 - db/migrate/20111206111202_create_panels.rb | 1 - db/migrate/20111206113803_create_panel_pictures.rb | 2 +- db/schema.rb | 27 +- db/speech_balloon_templates.json | 70 + .../controllers/speech_balloons_controller_spec.rb | 7 - .../controllers/system_pictures_controller_spec.rb | 7 - spec/factories.rb | 1 - spec/json/invalid_speech_balloon_templates.json | 38 +- spec/models/artist_spec.rb | 2 +- spec/models/balloon_spec.rb | 352 +++-- spec/models/common_license_spec.rb | 22 - spec/models/panel_spec.rb | 1499 ++++++++++++-------- spec/models/speech_balloon_spec.rb | 18 +- spec/models/speech_balloon_template_spec.rb | 217 ++- spec/models/speech_spec.rb | 296 ++-- 23 files changed, 1562 insertions(+), 1129 deletions(-) create mode 100644 app/views/original_licenses/result.html.erb create mode 100644 db/speech_balloon_templates.json diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb index 22362996..527fcf06 100644 --- a/app/controllers/panels_controller.rb +++ b/app/controllers/panels_controller.rb @@ -90,17 +90,15 @@ class PanelsController < ApplicationController @prm = params[:panel] || jsn @panel = Panel.new(@prm) treat_param @panel - @comic = Comic.find @panel.comic_id +# @comic = Comic.find @panel.comic_id respond_to do |format| - Panel.transaction do - if @panel.store - format.html { redirect_to @panel, notice: 'Panel was successfully created.' } - format.json { render json: @panel, status: :created, location: @panel } - else - format.html { render action: "new" } - format.json { render json: @panel.errors, status: :unprocessable_entity } - end + if @panel.store + format.html { redirect_to @panel, notice: 'Panel was successfully created.' } + format.json { render json: @panel, status: :created, location: @panel } + else + format.html { render action: "new" } + format.json { render json: @panel.errors, status: :unprocessable_entity } end end end @@ -110,12 +108,17 @@ class PanelsController < ApplicationController def update @panel = Panel.find(params[:id]) if @panel.own? @author + if params[:json] + jsn = JSON.parse(params[:json]) + end + @prm = params[:panel] || jsn respond_to do |format| Panel.transaction do if params[:panel][:t] and params[:panel][:t].to_i != @panel.t @panel.move_to params[:panel][:t].to_i end - if @panel.update_attributes(params[:panel]) + @panel.attributes = @prm + if @panel.store format.html { redirect_to @panel, notice: 'Panel was successfully updated.' } format.json { head :ok } else diff --git a/app/models/artist.rb b/app/models/artist.rb index 0fe96676..db85188d 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -5,11 +5,8 @@ class Artist < ActiveRecord::Base validates :name, :presence => true, :length => {:maximum => 30} # validates :default_license_id, :presence => true, :numericality => true, :existence => true - before_save do |r| - r.supply_default - end - def supply_default + self.name = 'no name' if self.name.blank? end def self.find_by_author author diff --git a/app/models/balloon.rb b/app/models/balloon.rb index acaefc8f..7af4df92 100644 --- a/app/models/balloon.rb +++ b/app/models/balloon.rb @@ -2,7 +2,7 @@ class Balloon < ActiveRecord::Base belongs_to :speech_balloon belongs_to :system_picture -# validates :speech_balloon_id, :presence => true, :numericality => true, :existence => true + validates :speech_balloon_id, :numericality => {:allow_blank => true} validates :system_picture_id, :presence => true, :numericality => true, :existence => true validates :x, :presence => true, :numericality => true validates :y, :presence => true, :numericality => true diff --git a/app/models/panel.rb b/app/models/panel.rb index 1375b0ed..7f0c8786 100644 --- a/app/models/panel.rb +++ b/app/models/panel.rb @@ -1,3 +1,4 @@ +#コマ class Panel < ActiveRecord::Base belongs_to :comic belongs_to :author @@ -9,7 +10,6 @@ class Panel < ActiveRecord::Base accepts_nested_attributes_for :speech_balloons, :allow_destroy => true # validates :comic_id, :presence => true, :numericality => true, :existence => true, :uniqueness => {:scope => :t} - validates :resource_picture_id, :numericality => {:allow_blank => true} validates :width, :presence => true, :numericality => true, :natural_number => true validates :height, :presence => true, :numericality => true, :natural_number => true validates :border, :presence => true, :numericality => {:greater_than_or_equal_to => 0} @@ -44,18 +44,84 @@ class Panel < ActiveRecord::Base Panel.find(:first, :conditions => ['comic_id = ? and t = ?', comic_id, t]) end - #更新する時にPanelIDをチェックしとかないと勝手に所属先を変えられるゾ！？ + def self.collect_element_value elements, name, ex_nil = false + e = elements.map {|e| + e.map {|o| + o[name] + } + }.flatten + e = e.compact if ex_nil + e + end + + def self.validate_id ary, pid + ary.map {|v| + if pid + (v == pid or v == nil) ? nil : false + else + v ? false : nil + end + }.compact.empty? + end + + def self.validate_element_id elements, name, pid + Panel.validate_id(Panel.collect_element_value(elements, name), pid) + end + + def self.validate_elements_id c + c.map {|conf| + Panel.validate_element_id(conf[:elements], conf[:name], conf[:parent_id]) ? nil : false + }.compact.empty? + end + + def self.validate_t ary + i = 0 + ary.compact.sort.each do |t| + break false unless t == i + i += 1 + end + ary.compact.size == i + end + + def self.validate_element_t elements, name + Panel.validate_t(Panel.collect_element_value(elements, name, true)) + end + + def self.validate_elements_t c + c.map {|conf| + Panel.validate_element_t(conf[:elements], conf[:name]) ? nil : false + }.compact.empty? + end + + def validate_id_list + r = self.speech_balloons.map {|sb| + {:elements => [sb.speeches, sb.balloons], :name => :speech_balloon_id, :parent_id => sb.id} + } + r.unshift({:elements => [self.panel_pictures, self.speech_balloons], :name => :panel_id, :parent_id => self.id}) + r + end + + def validate_child + r1 = Panel.validate_elements_id validate_id_list + r2 = Panel.validate_elements_t [ + {:elements => [self.panel_pictures, self.speech_balloons], :name => :t} + ] + r1 and r2 + end def store - self.speech_balloons - f = nil - f = Panel.find_t(self.comic_id, self.t) if self.t - if f - Panel.update_all('t = t + 1', ['comic_id = ? and t >= ?', self.comic_id, self.t]) - else - self.t = Panel.new_t self.comic_id + res = false + Panel.transaction do + raise ActiveRecord::Rollback unless validate_child + f = nil + f = Panel.find_t(self.comic_id, self.t) if self.t + if f + Panel.update_all('t = t + 1', ['comic_id = ? and t >= ?', self.comic_id, self.t]) + else + self.t = Panel.new_t self.comic_id + end + res = self.save end - self.save end def move_to new_t diff --git a/app/models/speech.rb b/app/models/speech.rb index 68b77f79..2beec5a4 100644 --- a/app/models/speech.rb +++ b/app/models/speech.rb @@ -1,7 +1,7 @@ class Speech < ActiveRecord::Base belongs_to :speech_balloon -# validates :speech_balloon_id, :presence => true, :numericality => true, :existence => true + validates :speech_balloon_id, :numericality => {:allow_blank => true} validates :x, :presence => true, :numericality => true validates :y, :presence => true, :numericality => true validates :width, :presence => true, :numericality => true, :natural_number => true diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb index ed857bed..05b280ba 100644 --- a/app/models/speech_balloon.rb +++ b/app/models/speech_balloon.rb @@ -7,7 +7,7 @@ class SpeechBalloon < ActiveRecord::Base accepts_nested_attributes_for :balloons accepts_nested_attributes_for :speeches -# validates :panel_id, :presence => true, :numericality => true, :existence => true + validates :panel_id, :numericality => {:allow_blank => true} validates :speech_balloon_template_id, :presence => true, :numericality => true, :existence => true validates :classname, :presence => true, :length => {:maximum => 50} validates :z, :presence => true, :numericality => {:greater_than => 0} diff --git a/app/views/original_licenses/result.html.erb b/app/views/original_licenses/result.html.erb new file mode 100644 index 00000000..66d61e25 --- /dev/null +++ b/app/views/original_licenses/result.html.erb @@ -0,0 +1,10 @@ + + + + + +<% @errors.each do |original_license| %> + + +<% end %> +
namemessage
<%= h original_license.name %><%= h original_license.import_error_message('
') %>
diff --git a/app/views/panels/list.html.erb b/app/views/panels/list.html.erb index bc62b117..aaa0945d 100644 --- a/app/views/panels/list.html.erb +++ b/app/views/panels/list.html.erb @@ -8,7 +8,6 @@ id Comic - bg Width Height Border @@ -26,7 +25,6 @@ <%= link_to panel.id, :action => :browse, :id => panel.id %> <%= link_to panel.comic_id, :controller => 'comics', :action => :browse, :id => panel.comic_id %> - <%= link_to panel.resource_picture_id, :controller => 'resource_pictures', :action => :browse, :id => panel.resource_picture_id %> <%= panel.width %> <%= panel.height %> <%= panel.border %> diff --git a/db/migrate/20111206111202_create_panels.rb b/db/migrate/20111206111202_create_panels.rb index 9cb1b929..0e11949f 100644 --- a/db/migrate/20111206111202_create_panels.rb +++ b/db/migrate/20111206111202_create_panels.rb @@ -2,7 +2,6 @@ class CreatePanels < ActiveRecord::Migration def change create_table :panels do |t| t.integer :comic_id - t.integer :resource_picture_id t.integer :width, :null => false, :default => 200 t.integer :height, :null => false, :default => 80 t.integer :border, :null => false, :default => 1 diff --git a/db/migrate/20111206113803_create_panel_pictures.rb b/db/migrate/20111206113803_create_panel_pictures.rb index e05cbbfc..d2d5a954 100644 --- a/db/migrate/20111206113803_create_panel_pictures.rb +++ b/db/migrate/20111206113803_create_panel_pictures.rb @@ -7,7 +7,7 @@ class CreatePanelPictures < ActiveRecord::Migration t.integer :x, :null => false t.integer :y, :null => false t.integer :z, :null => false - t.integer :t, :null => false, :default => 1 + t.integer :t, :null => false t.integer :width, :null => false t.integer :height, :null => false diff --git a/db/schema.rb b/db/schema.rb index 2c94bfb2..771d543e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -150,15 +150,15 @@ ActiveRecord::Schema.define(:version => 20120424100555) do add_index "original_pictures", ["artist_id"], :name => "index_original_pictures_on_artist_id" create_table "panel_pictures", :force => true do |t| - t.integer "panel_id", :null => false - t.integer "resource_picture_id", :null => false + t.integer "panel_id", :null => false + t.integer "resource_picture_id", :null => false t.string "link", :limit => 200 - t.integer "x", :null => false - t.integer "y", :null => false - t.integer "z", :null => false - t.integer "t", :default => 1, :null => false - t.integer "width", :null => false - t.integer "height", :null => false + t.integer "x", :null => false + t.integer "y", :null => false + t.integer "z", :null => false + t.integer "t", :null => false + t.integer "width", :null => false + t.integer "height", :null => false t.datetime "created_at" t.datetime "updated_at" end @@ -167,15 +167,14 @@ ActiveRecord::Schema.define(:version => 20120424100555) do create_table "panels", :force => true do |t| t.integer "comic_id" - t.integer "resource_picture_id" - t.integer "width", :default => 200, :null => false - t.integer "height", :default => 80, :null => false - t.integer "border", :default => 1, :null => false + t.integer "width", :default => 200, :null => false + t.integer "height", :default => 80, :null => false + t.integer "border", :default => 1, :null => false t.integer "x" t.integer "y" t.integer "z" - t.integer "t", :null => false - t.integer "author_id", :null => false + t.integer "t", :null => false + t.integer "author_id", :null => false t.datetime "created_at" t.datetime "updated_at" end diff --git a/db/speech_balloon_templates.json b/db/speech_balloon_templates.json new file mode 100644 index 00000000..2e1ce872 --- /dev/null +++ b/db/speech_balloon_templates.json @@ -0,0 +1,70 @@ +{ + "square@pettan.com": { + "classname": "Square", + "caption": "長方形", + "default_width": 150, + "default_height": 150, + "templates": { + "all": { + "balloon": { + "system_picture": "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" + }, + "speech": { + "x_rate": 1, + "y_rate": 1, + "width_rate": 98, + "height_rate": 98 + } + } + } + }, + "square with size@pettan.com": { + "classname": "SquareWithSize", + "caption": "長方形改", + "default_width": 150, + "default_height": 100, + "size_count": 3, + "width_offset": 0, + "height_offset": 0, + "width_step": 100, + "height_step": 100, + "templates": { + "small": { + "balloon": { + "size": 0, + "system_picture": "R0lGODlhZABkAPcAAAAAAAAAMwAAZgAAmQAAzAAA/wArAAArMwArZgArmQArzAAr/wBVAABVMwBVZgBVmQBVzABV/wCAAACAMwCAZgCAmQCAzACA/wCqAACqMwCqZgCqmQCqzACq/wDVAADVMwDVZgDVmQDVzADV/wD/AAD/MwD/ZgD/mQD/zAD//zMAADMAMzMAZjMAmTMAzDMA/zMrADMrMzMrZjMrmTMrzDMr/zNVADNVMzNVZjNVmTNVzDNV/zOAADOAMzOAZjOAmTOAzDOA/zOqADOqMzOqZjOqmTOqzDOq/zPVADPVMzPVZjPVmTPVzDPV/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYAmWYAzGYA/2YrAGYrM2YrZmYrmWYrzGYr/2ZVAGZVM2ZVZmZVmWZVzGZV/2aAAGaAM2aAZmaAmWaAzGaA/2aqAGaqM2aqZmaqmWaqzGaq/2bVAGbVM2bVZmbVmWbVzGbV/2b/AGb/M2b/Zmb/mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5krAJkrM5krZpkrmZkrzJkr/5lVAJlVM5lVZplVmZlVzJlV/5mAAJmAM5mAZpmAmZmAzJmA/5mqAJmqM5mqZpmqmZmqzJmq/5nVAJnVM5nVZpnVmZnVzJnV/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wrAMwrM8wrZswrmcwrzMwr/8xVAMxVM8xVZsxVmcxVzMxV/8yAAMyAM8yAZsyAmcyAzMyA/8yqAMyqM8yqZsyqmcyqzMyq/8zVAMzVM8zVZszVmczVzMzV/8z/AMz/M8z/Zsz/mcz/zMz///8AAP8AM/8AZv8Amf8AzP8A//8rAP8rM/8rZv8rmf8rzP8r//9VAP9VM/9VZv9Vmf9VzP9V//+AAP+AM/+AZv+Amf+AzP+A//+qAP+qM/+qZv+qmf+qzP+q///VAP/VM//VZv/Vmf/VzP/V////AP//M///Zv//mf//zP///wAAAAAAAAAAAAAAACH5BAEAAPwALAAAAABkAGQAAAj/AAEIHEiwoMGDCBMqXMiwocOHECNKnEixosWLGAfu28ixo8ePIEOKHEmypMmOBU+qXMmypcqULmPKnFkSJs2bOGXazMmzJ8mdPoMK3Qd0qFGcRY8qjZl0qdOXBJ9Kbdl0qtWPVa9qJRp1q1ePWb9KDSvWKdmySs+iNap2rdC2bn3CjctzLl2kXe+OzavXLN++af8CZit48NvChuUiTlx3MWO8Gh8PtSv5JOXKNR1jZqp5M9XOnldeDg1yNGmwoE9njqx6punWXFnDdvm6dW3Vt0/nJr07dG/PvzcHxzy8cnHJxx8nZ7w8cXPDzwdHBzy9b3W91+9mp7s9bne339eGX0c7vmx5see/pve6fmt7re+vxrc6f2r9vbJns7z/lL/f/PpBBWCAJvm3lIGBDUjgT6ktyBGCR0FImIIOhiThZA1WeOFhFFaIVYYObhiUiIp16CFKGaWo4oostuhiQQEBADs=" + }, + "speech": { + "x_rate": 3, + "y_rate": 3, + "width_rate": 94, + "height_rate": 94 + } + }, + "middle": { + "balloon": { + "size": 1, + "system_picture": "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" + }, + "speech": { + "x_rate": 2, + "y_rate": 2, + "width_rate": 96, + "height_rate": 96 + } + }, + "large": { + "balloon": { + "size": 2, + "system_picture": "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" + }, + "speech": { + "x_rate": 1, + "y_rate": 1, + "width_rate": 98, + "height_rate": 98 + } + } + } + } +} diff --git a/spec/controllers/speech_balloons_controller_spec.rb b/spec/controllers/speech_balloons_controller_spec.rb index db5a09d6..e53dc025 100644 --- a/spec/controllers/speech_balloons_controller_spec.rb +++ b/spec/controllers/speech_balloons_controller_spec.rb @@ -2,11 +2,4 @@ #フキダシ require 'spec_helper' describe SpeechBalloonsController do - describe "GET index" do - it "assigns all speech_baloons as @speech_baloons" do - speech_baloon = SpeechBaloon.create! valid_attributes - get :index - assigns(:speech_baloons).should eq([speech_baloon]) - end - end end diff --git a/spec/controllers/system_pictures_controller_spec.rb b/spec/controllers/system_pictures_controller_spec.rb index f5b67844..713534b4 100644 --- a/spec/controllers/system_pictures_controller_spec.rb +++ b/spec/controllers/system_pictures_controller_spec.rb @@ -3,11 +3,4 @@ require 'spec_helper' describe SystemPicturesController do - describe "GET index" do - it "assigns all system_pictures as @system_pictures" do - system_picture = SystemPicture.create! valid_attributes - get :index - assigns(:system_pictures).should eq([system_picture]) - end - end end diff --git a/spec/factories.rb b/spec/factories.rb index ffedb7d3..2f449d2d 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -196,7 +196,6 @@ end Factory.define :panel, :class => Panel do |panel| panel.comic_id 1 - panel.resource_picture_id nil panel.border 1 panel.x nil panel.y nil diff --git a/spec/json/invalid_speech_balloon_templates.json b/spec/json/invalid_speech_balloon_templates.json index 10a9b839..42a6afea 100644 --- a/spec/json/invalid_speech_balloon_templates.json +++ b/spec/json/invalid_speech_balloon_templates.json @@ -18,42 +18,16 @@ } } }, - "square@pettan.com": { - "classname": "Square", + "squareR@pettan.com": { + "classname": "", "caption": "長方形", "default_width": 150, - "default_height": 150, - "templates": { - "all": { - "balloon": { - "system_picture": "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" - }, - "speech": { - "x_rate": 1, - "y_rate": 1, - "width_rate": 98, - "height_rate": 98 - } - } - } + "default_height": 150 }, - "square@pettan.com": { - "classname": "Square", + "squareRR@pettan.com": { + "classname": "", "caption": "長方形", "default_width": 150, - "default_height": 150, - "templates": { - "all": { - "balloon": { - "system_picture": "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" - }, - "speech": { - "x_rate": 1, - "y_rate": 1, - "width_rate": 98, - "height_rate": 98 - } - } - } + "default_height": 150 } } diff --git a/spec/models/artist_spec.rb b/spec/models/artist_spec.rb index a3a167f4..42bb7374 100644 --- a/spec/models/artist_spec.rb +++ b/spec/models/artist_spec.rb @@ -34,7 +34,7 @@ describe Artist do describe '自動補充に於いて' do it '名前がno nameになっている' do @artist = Factory.build :artist, :name => nil - @artist.save + @artist.supply_default @artist.name.should eq 'no name' end end diff --git a/spec/models/balloon_spec.rb b/spec/models/balloon_spec.rb index e859c4b6..e3cb45e5 100644 --- a/spec/models/balloon_spec.rb +++ b/spec/models/balloon_spec.rb @@ -1,186 +1,178 @@ # -*- encoding: utf-8 -*- -require 'spec_helper' - -describe Balloon do - before do - Factory :admin - @user = Factory( :user_yas) - @author = @user.author +require 'spec_helper' +#セリフ +describe Balloon do + before do + Factory :admin + @user = Factory( :user_yas) + @author = @user.author @artist = Factory :artist_yas, :author_id => @author.id - @license = Factory :license - - @balloon = Factory :panel - @speech_balloon_template = Factory :speech_balloon_template + @license = Factory :license + + @balloon = Factory :panel + @speech_balloon_template = Factory :speech_balloon_template @speech_balloon = Factory :speech_balloon, :panel_id => @balloon.id, :speech_balloon_template_id => @speech_balloon_template.id - @system_picture = Factory :system_picture + @system_picture = Factory :system_picture end - - describe '検証に於いて' do + + describe '検証に於いて' do before do - end - - it 'オーソドックスなデータなら通る' do - @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id - @balloon.should be_valid - end - - context 'speech_balloon_idを検証するとき' do - before do - @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id - end - it 'テストデータの確認' do - @balloon.speech_balloon_id = @speech_balloon.id - @balloon.should be_valid - end - it 'nullなら失敗する' do - @balloon.speech_balloon_id = nil - @balloon.should_not be_valid - end - it '数値でなければ失敗する' do - @balloon.speech_balloon_id = 'a' - @balloon.should_not be_valid - end - it '存在するフキダシでなければ失敗する' do - @balloon.speech_balloon_id = 0 - @balloon.should_not be_valid - end - end - context 'system_picture_idを検証するとき' do - before do - @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id - end - it 'テストデータの確認' do - @balloon.system_picture_id = @system_picture.id - @balloon.should be_valid - end - it 'nullなら失敗する' do - @balloon.system_picture_id = nil - @balloon.should_not be_valid - end - it '数値でなければ失敗する' do - @balloon.system_picture_id = 'a' - @balloon.should_not be_valid - end - it '存在するシステム画像でなければ失敗する' do - @balloon.system_picture_id = 0 - @balloon.should_not be_valid - end - end - context 'xを検証するとき' do - before do - @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id - end - it 'テストデータの確認' do - @balloon.x = '1' - @balloon.should be_valid - end - it 'nullなら失敗する' do - @balloon.x = nil - @balloon.should_not be_valid - end - it '数値でなければ失敗する' do - @balloon.x = 'a' - @balloon.should_not be_valid - end - it '0なら通る' do - @balloon.x = '0' - @balloon.should be_valid - end - it '負でも通る' do - @balloon.x = -1 - @balloon.should be_valid - end - end - context 'yを検証するとき' do - before do - @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id - end - it 'テストデータの確認' do - @balloon.y = '1' - @balloon.should be_valid - end - it 'nullなら失敗する' do - @balloon.y = nil - @balloon.should_not be_valid - end - it '数値でなければ失敗する' do - @balloon.y = 'a' - @balloon.should_not be_valid - end - it '0なら通る' do - @balloon.y = '0' - @balloon.should be_valid - end - it '負でも通る' do - @balloon.y = -1 - @balloon.should be_valid - end - end - context 'widthを検証するとき' do - before do - @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id - end - it 'テストデータの確認' do - @balloon.width = 1 - @balloon.should be_valid - end - it 'nullなら失敗する' do - @balloon.width = nil - @balloon.should_not be_valid - end - it '数値でなければ失敗する' do - @balloon.width = 'a' - @balloon.should_not be_valid - end - it '0なら失敗する' do - @balloon.width = '0' - @balloon.should_not be_valid - end - it '負でも失敗する' do - @balloon.width = -1 - @balloon.should_not be_valid - end - end - context 'heightを検証するとき' do - before do - @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id - end - it 'テストデータの確認' do - @balloon.height = '1' - @balloon.should be_valid - end - it 'nullなら失敗する' do - @balloon.height = nil - @balloon.should_not be_valid - end - it '数値でなければ失敗する' do - @balloon.height = 'a' - @balloon.should_not be_valid - end - it '0なら失敗する' do - @balloon.height = '0' - @balloon.should_not be_valid - end - it '負でも失敗する' do - @balloon.height = -1 - @balloon.should_not be_valid - end - end - context 'settingsを検証するとき' do - before do - @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id - end - it 'テストデータの確認' do - @balloon.settings = '' - @balloon.should be_valid - end - end - end - - describe 'データ補充に於いて' do - before do - end - - end + end + + it 'オーソドックスなデータなら通る' do + @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id + @balloon.should be_valid + end + + context 'speech_balloon_idを検証するとき' do + before do + @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id + end + it 'テストデータの確認' do + @balloon.speech_balloon_id = @speech_balloon.id + @balloon.should be_valid + end + it '数値でなければ失敗する' do + @balloon.speech_balloon_id = 'a' + @balloon.should_not be_valid + end + end + context 'system_picture_idを検証するとき' do + before do + @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id + end + it 'テストデータの確認' do + @balloon.system_picture_id = @system_picture.id + @balloon.should be_valid + end + it 'nullなら失敗する' do + @balloon.system_picture_id = nil + @balloon.should_not be_valid + end + it '数値でなければ失敗する' do + @balloon.system_picture_id = 'a' + @balloon.should_not be_valid + end + it '存在するシステム画像でなければ失敗する' do + @balloon.system_picture_id = 0 + @balloon.should_not be_valid + end + end + context 'xを検証するとき' do + before do + @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id + end + it 'テストデータの確認' do + @balloon.x = '1' + @balloon.should be_valid + end + it 'nullなら失敗する' do + @balloon.x = nil + @balloon.should_not be_valid + end + it '数値でなければ失敗する' do + @balloon.x = 'a' + @balloon.should_not be_valid + end + it '0なら通る' do + @balloon.x = '0' + @balloon.should be_valid + end + it '負でも通る' do + @balloon.x = -1 + @balloon.should be_valid + end + end + context 'yを検証するとき' do + before do + @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id + end + it 'テストデータの確認' do + @balloon.y = '1' + @balloon.should be_valid + end + it 'nullなら失敗する' do + @balloon.y = nil + @balloon.should_not be_valid + end + it '数値でなければ失敗する' do + @balloon.y = 'a' + @balloon.should_not be_valid + end + it '0なら通る' do + @balloon.y = '0' + @balloon.should be_valid + end + it '負でも通る' do + @balloon.y = -1 + @balloon.should be_valid + end + end + context 'widthを検証するとき' do + before do + @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id + end + it 'テストデータの確認' do + @balloon.width = 1 + @balloon.should be_valid + end + it 'nullなら失敗する' do + @balloon.width = nil + @balloon.should_not be_valid + end + it '数値でなければ失敗する' do + @balloon.width = 'a' + @balloon.should_not be_valid + end + it '0なら失敗する' do + @balloon.width = '0' + @balloon.should_not be_valid + end + it '負でも失敗する' do + @balloon.width = -1 + @balloon.should_not be_valid + end + end + context 'heightを検証するとき' do + before do + @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id + end + it 'テストデータの確認' do + @balloon.height = '1' + @balloon.should be_valid + end + it 'nullなら失敗する' do + @balloon.height = nil + @balloon.should_not be_valid + end + it '数値でなければ失敗する' do + @balloon.height = 'a' + @balloon.should_not be_valid + end + it '0なら失敗する' do + @balloon.height = '0' + @balloon.should_not be_valid + end + it '負でも失敗する' do + @balloon.height = -1 + @balloon.should_not be_valid + end + end + context 'settingsを検証するとき' do + before do + @balloon = Factory.build :balloon, :speech_balloon_id => @speech_balloon.id, :system_picture_id => @system_picture.id + end + it 'テストデータの確認' do + @balloon.settings = '' + @balloon.should be_valid + end + end + end + + describe 'データ補充に於いて' do + before do + end + + end -end +end diff --git a/spec/models/common_license_spec.rb b/spec/models/common_license_spec.rb index 389fd699..70d2031e 100644 --- a/spec/models/common_license_spec.rb +++ b/spec/models/common_license_spec.rb @@ -511,28 +511,6 @@ describe CommonLicense do end describe 'インポートエラーの表示に於いて' do - before do - @l = Factory :license - @cl = Factory.build :common_license, :license_id => @l.id - end - it '全体エラーだけなら、そのまま返す' do - @cl.errors.add :base, 'base error' - @cl.import_error_message.should eq 'base error' - end - context '複数でエラーのとき' do - it '各エラーを改行で区切って結合して返す' do - @cl.errors.add :name, 'name error' - @cl.errors.add :url, 'url error' - @cl.import_error_message.should eq 'name error\nurl error' - end - end - context '区切り指定が
で複数でエラーのとき' do - it '各エラーを改行で区切って結合して返す' do - @cl.errors.add :name, 'name error' - @cl.errors.add :url, 'url error' - @cl.import_error_message('
').should eq 'name error
url error' - end - end end describe 'ファイル取り込みに於いて' do diff --git a/spec/models/panel_spec.rb b/spec/models/panel_spec.rb index fd63b140..0ec0e914 100644 --- a/spec/models/panel_spec.rb +++ b/spec/models/panel_spec.rb @@ -1,677 +1,968 @@ # -*- encoding: utf-8 -*- -require 'spec_helper' - -describe Panel do - before do - Factory :admin - @license = Factory :license - @user = Factory( :user_yas) - @author = @user.author +require 'spec_helper' +#コマ +describe Panel do + before do + Factory :admin + @license = Factory :license + @user = Factory( :user_yas) + @author = @user.author @artist = Factory :artist_yas, :author_id => @author.id - @other_user = Factory( :user_yas) - @other_author = @other_user.author - @other_artist = Factory :artist_yas, :author_id => @other_author.id + @other_user = Factory( :user_yas) + @other_author = @other_user.author + @other_artist = Factory :artist_yas, :author_id => @other_author.id @op = Factory :original_picture, :artist_id => @artist.id, :license_id => @license.id - @rp = Factory :resource_picture, :original_picture_id => @op.id, :license_id => @license.id + @rp = Factory :resource_picture, :original_picture_id => @op.id, :license_id => @license.id + @sbt = Factory :speech_balloon_template end - - describe '検証に於いて' do + + describe '検証に於いて' do before do - @comic = Factory :comic, :author_id => @author.id - end - - it 'オーソドックスなデータなら通る' do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - @panel.should be_valid - end - - context 'comic_idを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => nil - end - it 'テストデータの確認' do - @panel.comic_id = @comic.id - @panel.should be_valid - end - it 'nullなら失敗する' do - @panel.comic_id = nil - @panel.should_not be_valid - end - it '数値でなければ失敗する' do - @panel.comic_id = 'a' - @panel.should_not be_valid - end - it '存在するコミックでなければ失敗する' do - @panel.comic_id = 0 - @panel.should_not be_valid - end - it 'コミックidとtが重複していると失敗する' do - @panel.save - @panel2 = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - @panel2.should_not be_valid - end - end - context 'resource_picture_idを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - end - it 'テストデータの確認' do - @panel.resource_picture_id = @rp.id - @panel.should be_valid - end - it 'nullなら通る' do - @panel.resource_picture_id = nil - @panel.should be_valid - end - it '数値でなければ失敗する' do - @panel.resource_picture_id = 'a' - @panel.should_not be_valid - end - end - context 'widthを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - end - it 'テストデータの確認' do - @panel.width = 1 - @panel.should be_valid - end - it 'nullなら失敗する' do - @panel.width = nil - @panel.should_not be_valid - end - it '数値でなければ失敗する' do - @panel.width = 'a' - @panel.should_not be_valid - end - it '0なら失敗する' do - @panel.width = '0' - @panel.should_not be_valid - end - it '負でも失敗する' do - @panel.width = -1 - @panel.should_not be_valid - end - end - context 'heightを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - end - it 'テストデータの確認' do - @panel.height = '1' - @panel.should be_valid - end - it 'nullなら失敗する' do - @panel.height = nil - @panel.should_not be_valid - end - it '数値でなければ失敗する' do - @panel.height = 'a' - @panel.should_not be_valid - end - it '0なら失敗する' do - @panel.height = '0' - @panel.should_not be_valid - end - it '負でも失敗する' do - @panel.height = -1 - @panel.should_not be_valid - end - end - context 'borderを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - end - it 'テストデータの確認' do - @panel.border = '1' - @panel.should be_valid - end - it 'nullなら失敗する' do - @panel.border = nil - @panel.should_not be_valid - end - it '数値でなければ失敗する' do - @panel.border = 'a' - @panel.should_not be_valid - end - it '負なら失敗する' do - @panel.border = '-1' - @panel.should_not be_valid - end - it '0なら通る' do - @panel.border = 0 - @panel.should be_valid - end - end - context 'xを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - end - it 'テストデータの確認' do - @panel.x = '1' - @panel.should be_valid - end - it '数値でなければ失敗する' do - @panel.x = 'a' - @panel.should_not be_valid - end - it '0なら通る' do - @panel.x = '0' - @panel.should be_valid - end - it '負でも通る' do - @panel.x = -1 - @panel.should be_valid - end - end - context 'yを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - end - it 'テストデータの確認' do - @panel.y = '1' - @panel.should be_valid - end - it '数値でなければ失敗する' do - @panel.y = 'a' - @panel.should_not be_valid - end - it '0なら通る' do - @panel.y = '0' - @panel.should be_valid - end - it '負でも通る' do - @panel.y = -1 - @panel.should be_valid - end - end - context 'zを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - end - it 'テストデータの確認' do - @panel.z = '1' - @panel.should be_valid - end - it '数値でなければ失敗する' do - @panel.z = 'a' - @panel.should_not be_valid - end - it '0なら失敗する' do - @panel.z = '0' - @panel.should_not be_valid - end - it '負なら失敗する' do - @panel.z = -1 - @panel.should_not be_valid - end - end - context 'tを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - end - it 'テストデータの確認' do - @panel.t = '1' - @panel.should be_valid - end - it '数値でなければ失敗する' do - @panel.t = 'a' - @panel.should_not be_valid - end - it '0なら通る' do - @panel.t = '0' - @panel.should be_valid - end - it '負でも失敗する' do - @panel.t = -1 - @panel.should_not be_valid - end - end - context 'author_idを検証するとき' do - before do - @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id - end - it 'テストデータの確認' do - @panel.author_id = @author.id - @panel.should be_valid - end - it 'nullなら失敗する' do - @panel.author_id = nil - @panel.should_not be_valid - end - it '数値でなければ失敗する' do - @panel.author_id = 'a' - @panel.should_not be_valid - end - it '存在する絵師でなければ失敗する' do - @panel.author_id = 0 - @panel.should_not be_valid - end - end - context '全体を検証するとき' do - before do - @panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id - end - end - end - - describe 'データ補充に於いて' do + @comic = Factory :comic, :author_id => @author.id + end + + it 'オーソドックスなデータなら通る' do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id + @panel.should be_valid + end + + context 'comic_idを検証するとき' do + before do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => nil + end + it 'テストデータの確認' do + @panel.comic_id = @comic.id + @panel.should be_valid + end + end + context 'widthを検証するとき' do + before do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id + end + it 'テストデータの確認' do + @panel.width = 1 + @panel.should be_valid + end + it 'nullなら失敗する' do + @panel.width = nil + @panel.should_not be_valid + end + it '数値でなければ失敗する' do + @panel.width = 'a' + @panel.should_not be_valid + end + it '0なら失敗する' do + @panel.width = '0' + @panel.should_not be_valid + end + it '負でも失敗する' do + @panel.width = -1 + @panel.should_not be_valid + end + end + context 'heightを検証するとき' do + before do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id + end + it 'テストデータの確認' do + @panel.height = '1' + @panel.should be_valid + end + it 'nullなら失敗する' do + @panel.height = nil + @panel.should_not be_valid + end + it '数値でなければ失敗する' do + @panel.height = 'a' + @panel.should_not be_valid + end + it '0なら失敗する' do + @panel.height = '0' + @panel.should_not be_valid + end + it '負でも失敗する' do + @panel.height = -1 + @panel.should_not be_valid + end + end + context 'borderを検証するとき' do + before do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id + end + it 'テストデータの確認' do + @panel.border = '1' + @panel.should be_valid + end + it 'nullなら失敗する' do + @panel.border = nil + @panel.should_not be_valid + end + it '数値でなければ失敗する' do + @panel.border = 'a' + @panel.should_not be_valid + end + it '負なら失敗する' do + @panel.border = '-1' + @panel.should_not be_valid + end + it '0なら通る' do + @panel.border = 0 + @panel.should be_valid + end + end + context 'xを検証するとき' do + before do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id + end + it 'テストデータの確認' do + @panel.x = '1' + @panel.should be_valid + end + it '数値でなければ失敗する' do + @panel.x = 'a' + @panel.should_not be_valid + end + it '0なら通る' do + @panel.x = '0' + @panel.should be_valid + end + it '負でも通る' do + @panel.x = -1 + @panel.should be_valid + end + end + context 'yを検証するとき' do + before do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id + end + it 'テストデータの確認' do + @panel.y = '1' + @panel.should be_valid + end + it '数値でなければ失敗する' do + @panel.y = 'a' + @panel.should_not be_valid + end + it '0なら通る' do + @panel.y = '0' + @panel.should be_valid + end + it '負でも通る' do + @panel.y = -1 + @panel.should be_valid + end + end + context 'zを検証するとき' do + before do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id + end + it 'テストデータの確認' do + @panel.z = '1' + @panel.should be_valid + end + it '数値でなければ失敗する' do + @panel.z = 'a' + @panel.should_not be_valid + end + it '0なら失敗する' do + @panel.z = '0' + @panel.should_not be_valid + end + it '負なら失敗する' do + @panel.z = -1 + @panel.should_not be_valid + end + end + context 'tを検証するとき' do + before do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id + end + it 'テストデータの確認' do + @panel.t = '1' + @panel.should be_valid + end + it '数値でなければ失敗する' do + @panel.t = 'a' + @panel.should_not be_valid + end + it '0なら通る' do + @panel.t = '0' + @panel.should be_valid + end + it '負でも失敗する' do + @panel.t = -1 + @panel.should_not be_valid + end + end + context 'author_idを検証するとき' do + before do + @panel = Factory.build :panel, :author_id => @author.id, :comic_id => @comic.id + end + it 'テストデータの確認' do + @panel.author_id = @author.id + @panel.should be_valid + end + it 'nullなら失敗する' do + @panel.author_id = nil + @panel.should_not be_valid + end + it '数値でなければ失敗する' do + @panel.author_id = 'a' + @panel.should_not be_valid + end + it '存在する絵師でなければ失敗する' do + @panel.author_id = 0 + @panel.should_not be_valid + end + end + context '全体を検証するとき' do + before do + @panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id + end + end + end + + describe 'データ補充に於いて' do before do - @comic = Factory :comic, :author_id => @author.id - @panel = Factory.build :panel, :comic_id => @comic.id - end - context 'widthを補充' do + @comic = Factory :comic, :author_id => @author.id + @panel = Factory.build :panel, :comic_id => @comic.id + end + context 'widthを補充' do it '空の時はコミックから補充する' do - @panel.width = nil + @panel.width = nil @panel.supply_default @author - @panel.width.should eq @comic.width - end + @panel.width.should eq @comic.width + end it '空の時でもコミックが不在なら補充しない' do - @panel.width = nil - @panel.comic_id = nil + @panel.width = nil + @panel.comic_id = nil @panel.supply_default @author - @panel.width.should be_nil - end - it '空でない時は変化しない' do + @panel.width.should be_nil + end + it '空でない時は変化しない' do @panel.width = 45 - lambda { + lambda { @panel.supply_default @author - }.should_not change @panel, :width - end - end - context 'heightを補充' do - it '空の時はコミックから補充する' do - @panel.height = nil + }.should_not change @panel, :width + end + end + context 'heightを補充' do + it '空の時はコミックから補充する' do + @panel.height = nil @panel.supply_default @author - @panel.height.should eq @comic.height - end + @panel.height.should eq @comic.height + end it '空の時でもコミックが不在なら補充しない' do - @panel.height = nil - @panel.comic_id = nil + @panel.height = nil + @panel.comic_id = nil @panel.supply_default @author - @panel.height.should be_nil - end - it '空でない時は変化しない' do + @panel.height.should be_nil + end + it '空でない時は変化しない' do @panel.height = 87 - lambda { + lambda { @panel.supply_default @author - }.should_not change @panel, :height - end - end - context 'borderを補充' do - it '空の時は0を補充する' do - @panel.border = nil + }.should_not change @panel, :height + end + end + context 'borderを補充' do + it '空の時は0を補充する' do + @panel.border = nil @panel.supply_default @author - @panel.border.should eq 0 - end - it '空でない時は変化しない' do + @panel.border.should eq 0 + end + it '空でない時は変化しない' do @panel.border = 1 - lambda { + lambda { @panel.supply_default @author - }.should_not change @panel, :border - end - end - context 'tを補充' do - it '空の時はコミック内のtの最大値+1を補充する' do + }.should_not change @panel, :border + end + end + context 'tを補充' do + it '空の時はコミック内のtの最大値+1を補充する' do pl = Factory :panel, :author_id => @author.id, :comic_id => @comic.id, :t => 0 - @panel.t = nil + @panel.t = nil @panel.supply_default @author - @panel.t.should eq 1 - end - it '空でコミック初のコマなら0を補充する' do - @panel.t = nil + @panel.t.should eq 1 + end + it '空でコミック初のコマなら0を補充する' do + @panel.t = nil @panel.supply_default @author - @panel.t.should eq 0 - end - it '空の時でも更新ケースなら補充しない' do + @panel.t.should eq 0 + end + it '空の時でも更新ケースなら補充しない' do pl = Factory :panel, :author_id => @author.id, :comic_id => @comic.id, :t => 1 pl.t = nil - lambda { + lambda { pl.supply_default @author - }.should_not change pl, :t - end - it '空でない時は変化しない' do + }.should_not change pl, :t + end + it '空でない時は変化しない' do @panel.t = 1 - lambda { + lambda { @panel.supply_default @author - }.should_not change @panel, :t - end - end - context 'author_idを補充' do - it 'ログイン中の作家idを補充する' do - @panel.author_id = nil + }.should_not change @panel, :t + end + end + context 'author_idを補充' do + it 'ログイン中の作家idを補充する' do + @panel.author_id = nil @panel.supply_default @author - @panel.author_id.should eq @author.id - end - end - - end + @panel.author_id.should eq @author.id + end + end + + end - describe '作者判定に於いて' do - before do - @comic = Factory :comic, :author_id => @author.id - end - it '自作のコマならyes' do - panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id - panel.own?(@author).should == true - end - it '他人のコマならno' do - panel = Factory :panel, :author_id => @other_author.id, :comic_id => @comic.id - panel.own?(@author).should == false - end - it '作家が不明ならno' do - panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id - panel.own?(nil).should == false - end - end - describe '閲覧許可に於いて' do - before do - @comic = Factory :comic, :author_id => @author.id - end - it '自作の公開コミックのコマを見るときは許可する' do - Comic.any_instance.stub(:visible?).and_return(true) - panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id - panel.visible?(@author).should == true - end - it '自作のコマは非公開コミックでも許可する' do - Comic.any_instance.stub(:visible?).and_return(false) - panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id - panel.visible?(@author).should == true - end - it '他人のコマでも公開コミックなら許可する' do - Comic.any_instance.stub(:visible?).and_return(true) - panel = Factory :panel, :author_id => @other_author.id, :comic_id => @comic.id - panel.visible?(@author).should == true - end - it '他人のコマで非公開コミックなら許可しない' do - Comic.any_instance.stub(:visible?).and_return(false) - panel = Factory :panel, :author_id => @other_author.id, :comic_id => @comic.id - panel.visible?(@author).should == false - end - end - describe '単体取得に於いて' do - before do - @comic = Factory :comic, :author_id => @author.id - @panel = Factory :panel, :comic_id => @comic.id, :author_id => @author.id - end - it '指定のコマを返す' do - Comic.any_instance.stub(:visible?).and_return(true) - pl = Panel.show @panel.id, @author - pl.should eq @panel - end - context '他人の非公開コミックのコマを開こうとしたとき' do - it '403Forbidden例外を返す' do - Panel.any_instance.stub(:visible?).and_return(false) - lambda{ - Panel.show @panel.id, @author - }.should raise_error(ActiveRecord::Forbidden) - end - end - context '存在しないコマを開こうとしたとき' do - it '404RecordNotFound例外を返す' do - lambda{ - Panel.show 110, @author - }.should raise_error(ActiveRecord::RecordNotFound) - end - end - end - describe '関連テーブルプションに於いて' do - context 'オプションがないとき' do - it '4つの項目を含んでいる' do - r = Panel.show_include_opt + describe '作者判定に於いて' do + before do + @comic = Factory :comic, :author_id => @author.id + end + it '自作のコマならyes' do + panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id + panel.own?(@author).should == true + end + it '他人のコマならno' do + panel = Factory :panel, :author_id => @other_author.id, :comic_id => @comic.id + panel.own?(@author).should == false + end + it '作家が不明ならno' do + panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id + panel.own?(nil).should == false + end + end + describe '閲覧許可に於いて' do + before do + @comic = Factory :comic, :author_id => @author.id + end + it '自作の公開コミックのコマを見るときは許可する' do + Comic.any_instance.stub(:visible?).and_return(true) + panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id + panel.visible?(@author).should == true + end + it '自作のコマは非公開コミックでも許可する' do + Comic.any_instance.stub(:visible?).and_return(false) + panel = Factory :panel, :author_id => @author.id, :comic_id => @comic.id + panel.visible?(@author).should == true + end + it '他人のコマでも公開コミックなら許可する' do + Comic.any_instance.stub(:visible?).and_return(true) + panel = Factory :panel, :author_id => @other_author.id, :comic_id => @comic.id + panel.visible?(@author).should == true + end + it '他人のコマで非公開コミックなら許可しない' do + Comic.any_instance.stub(:visible?).and_return(false) + panel = Factory :panel, :author_id => @other_author.id, :comic_id => @comic.id + panel.visible?(@author).should == false + end + end + describe '単体取得に於いて' do + before do + @comic = Factory :comic, :author_id => @author.id + @panel = Factory :panel, :comic_id => @comic.id, :author_id => @author.id + end + it '指定のコマを返す' do + Comic.any_instance.stub(:visible?).and_return(true) + pl = Panel.show @panel.id, @author + pl.should eq @panel + end + context '他人の非公開コミックのコマを開こうとしたとき' do + it '403Forbidden例外を返す' do + Panel.any_instance.stub(:visible?).and_return(false) + lambda{ + Panel.show @panel.id, @author + }.should raise_error(ActiveRecord::Forbidden) + end + end + context '存在しないコマを開こうとしたとき' do + it '404RecordNotFound例外を返す' do + lambda{ + Panel.show 110, @author + }.should raise_error(ActiveRecord::RecordNotFound) + end + end + end + describe '関連テーブルプションに於いて' do + context 'オプションがないとき' do + it '4つの項目を含んでいる' do + r = Panel.show_include_opt r.should have(4).items - end - it 'コミックを含んでいる' do - r = Panel.show_include_opt + end + it 'コミックを含んでいる' do + r = Panel.show_include_opt r.has_key?(:comic).should be_true - end - it 'コマ絵を含んでいる' do - r = Panel.show_include_opt + end + it 'コマ絵を含んでいる' do + r = Panel.show_include_opt r.has_key?(:panel_pictures).should be_true - end - it 'コマ絵は素材を含んでいる' do - r = Panel.show_include_opt + end + it 'コマ絵は素材を含んでいる' do + r = Panel.show_include_opt r[:panel_pictures].has_key?(:resource_picture).should be_true - end - it '素材は絵師を含んでいる' do - r = Panel.show_include_opt + end + it '素材は絵師を含んでいる' do + r = Panel.show_include_opt r[:panel_pictures][:resource_picture].has_key?(:artist).should be_true - end - it '素材はライセンスを含んでいる' do - r = Panel.show_include_opt + end + it '素材はライセンスを含んでいる' do + r = Panel.show_include_opt r[:panel_pictures][:resource_picture].has_key?(:license).should be_true - end - it 'フキダシを含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシを含んでいる' do + r = Panel.show_include_opt r.has_key?(:speech_balloons).should be_true - end - it 'フキダシはフキダシ枠を含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシはフキダシ枠を含んでいる' do + r = Panel.show_include_opt r[:speech_balloons].has_key?(:balloons).should be_true - end - it 'フキダシはセリフを含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシはセリフを含んでいる' do + r = Panel.show_include_opt r[:speech_balloons].has_key?(:speeches).should be_true - end - it '作家を含んでいる' do - r = Panel.show_include_opt + end + it '作家を含んでいる' do + r = Panel.show_include_opt r.has_key?(:author).should be_true - end - end - context 'オプションで原画を含ませたとき' do - it '5つの項目を含んでいる' do - r = Panel.show_include_opt(:include => {:test => {}}) + end + end + context 'オプションで原画を含ませたとき' do + it '5つの項目を含んでいる' do + r = Panel.show_include_opt(:include => {:test => {}}) r.should have(5).items - end - it 'testを含んでいる' do - r = Panel.show_include_opt(:include => {:test => {}}) + end + it 'testを含んでいる' do + r = Panel.show_include_opt(:include => {:test => {}}) r.has_key?(:test).should be_true - end - end - end - describe 'json単体出力オプションに於いて' do - it 'includeキーを含んでいる' do - r = Panel.show_json_include_opt - r.has_key?(:include).should be_true - end - it '4つの項目を含んでいる' do - r = Panel.show_json_include_opt[:include] + end + end + end + describe 'json単体出力オプションに於いて' do + it 'includeキーを含んでいる' do + r = Panel.show_json_include_opt + r.has_key?(:include).should be_true + end + it '4つの項目を含んでいる' do + r = Panel.show_json_include_opt[:include] r.should have(4).items - end - it 'コミックを含んでいる' do - r = Panel.show_json_include_opt[:include] + end + it 'コミックを含んでいる' do + r = Panel.show_json_include_opt[:include] r.has_key?(:comic).should be_true - end - it 'コマ絵を含んでいる' do - r = Panel.show_json_include_opt[:include] + end + it 'コマ絵を含んでいる' do + r = Panel.show_json_include_opt[:include] r.has_key?(:panel_pictures).should be_true - end - it 'コマ絵は素材を含んでいる' do - r = Panel.show_json_include_opt[:include] + end + it 'コマ絵は素材を含んでいる' do + r = Panel.show_json_include_opt[:include] r[:panel_pictures].has_key?(:resource_picture).should be_true - end - it '素材は絵師を含んでいる' do - r = Panel.show_json_include_opt[:include] + end + it '素材は絵師を含んでいる' do + r = Panel.show_json_include_opt[:include] r[:panel_pictures][:resource_picture].has_key?(:artist).should be_true - end - it '素材はライセンスを含んでいる' do - r = Panel.show_json_include_opt[:include] + end + it '素材はライセンスを含んでいる' do + r = Panel.show_json_include_opt[:include] r[:panel_pictures][:resource_picture].has_key?(:license).should be_true - end - it 'フキダシを含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシを含んでいる' do + r = Panel.show_include_opt r.has_key?(:speech_balloons).should be_true - end - it 'フキダシはフキダシ枠を含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシはフキダシ枠を含んでいる' do + r = Panel.show_include_opt r[:speech_balloons].has_key?(:balloons).should be_true - end - it 'フキダシはセリフを含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシはセリフを含んでいる' do + r = Panel.show_include_opt r[:speech_balloons].has_key?(:speeches).should be_true - end - it '作家を含んでいる' do - r = Panel.show_json_include_opt[:include] + end + it '作家を含んでいる' do + r = Panel.show_json_include_opt[:include] r.has_key?(:author).should be_true - end - end - describe '一覧取得に於いて' do - before do - @comic = Factory :comic, :author_id => @author.id - @panel = Factory :panel, :comic_id => @comic.id, :author_id => @author.id - end - context 'page補正について' do - it '文字列から数値に変換される' do - Panel.page('8').should eq 8 - end - it 'nilの場合は1になる' do - Panel.page().should eq 1 - end - it '0以下の場合は1になる' do - Panel.page('0').should eq 1 - end - end - context 'page_size補正について' do - it '文字列から数値に変換される' do - Panel.page_size('7').should eq 7 - end - it 'nilの場合はPanel.default_page_sizeになる' do - Panel.page_size().should eq Panel.default_page_size - end - it '0以下の場合はPanel.default_page_sizeになる' do - Panel.page_size('0').should eq Panel.default_page_size - end - it 'Panel.max_page_sizeを超えた場合はPanel.max_page_sizeになる' do - Panel.page_size('1000').should eq Panel.max_page_size - end - end - it 'リストを返す' do - pl = Panel.list - pl.should eq [@panel] - end - it '時系列で並んでいる' do - npl = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 1 - pl = Panel.list - pl.should eq [npl, @panel] - end - context 'DBに5件あって1ページの件数を2件に変えたとして' do - before do - @npl2 = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 1 - @npl3 = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 2 - @npl4 = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 3 - @npl5 = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 4 - Panel.stub(:default_page_size).and_return(2) - end - it '通常は2件を返す' do - pl = Panel.list - pl.should have(2).items - end - it 'page=1なら末尾2件を返す' do - #時系列で並んでいる - pl = Panel.list( {}, 1) - pl.should eq [@npl5, @npl4] - end - it 'page=2なら中間2件を返す' do - pl = Panel.list({}, 2) - pl.should eq [@npl3, @npl2] - end - it 'page=3なら先頭1件を返す' do - pl = Panel.list({}, 3) - pl.should eq [@panel] - end - end - end - describe 'list関連テーブルプションに於いて' do - it 'includeキーを含んでいる' do - r = Panel.list_opt - r.has_key?(:include).should be_true - end - it '4つの項目を含んでいる' do - r = Panel.list_opt[:include] + end + end + describe '一覧取得に於いて' do + before do + @comic = Factory :comic, :author_id => @author.id + @panel = Factory :panel, :comic_id => @comic.id, :author_id => @author.id + end + context 'page補正について' do + it '文字列から数値に変換される' do + Panel.page('8').should eq 8 + end + it 'nilの場合は1になる' do + Panel.page().should eq 1 + end + it '0以下の場合は1になる' do + Panel.page('0').should eq 1 + end + end + context 'page_size補正について' do + it '文字列から数値に変換される' do + Panel.page_size('7').should eq 7 + end + it 'nilの場合はPanel.default_page_sizeになる' do + Panel.page_size().should eq Panel.default_page_size + end + it '0以下の場合はPanel.default_page_sizeになる' do + Panel.page_size('0').should eq Panel.default_page_size + end + it 'Panel.max_page_sizeを超えた場合はPanel.max_page_sizeになる' do + Panel.page_size('1000').should eq Panel.max_page_size + end + end + it 'リストを返す' do + pl = Panel.list + pl.should eq [@panel] + end + it '時系列で並んでいる' do + npl = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 1 + pl = Panel.list + pl.should eq [npl, @panel] + end + context 'DBに5件あって1ページの件数を2件に変えたとして' do + before do + @npl2 = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 1 + @npl3 = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 2 + @npl4 = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 3 + @npl5 = Factory :panel, :comic_id => @comic.id, :author_id => @author.id, :t => 4 + Panel.stub(:default_page_size).and_return(2) + end + it '通常は2件を返す' do + pl = Panel.list + pl.should have(2).items + end + it 'page=1なら末尾2件を返す' do + #時系列で並んでいる + pl = Panel.list( {}, 1) + pl.should eq [@npl5, @npl4] + end + it 'page=2なら中間2件を返す' do + pl = Panel.list({}, 2) + pl.should eq [@npl3, @npl2] + end + it 'page=3なら先頭1件を返す' do + pl = Panel.list({}, 3) + pl.should eq [@panel] + end + end + end + describe 'list関連テーブルプションに於いて' do + it 'includeキーを含んでいる' do + r = Panel.list_opt + r.has_key?(:include).should be_true + end + it '4つの項目を含んでいる' do + r = Panel.list_opt[:include] r.should have(4).items - end - it 'コミックを含んでいる' do - r = Panel.list_opt[:include] + end + it 'コミックを含んでいる' do + r = Panel.list_opt[:include] r.has_key?(:comic).should be_true - end - it 'コマ絵を含んでいる' do - r = Panel.list_opt[:include] + end + it 'コマ絵を含んでいる' do + r = Panel.list_opt[:include] r.has_key?(:panel_pictures).should be_true - end - it 'コマ絵は素材を含んでいる' do - r = Panel.list_opt[:include] + end + it 'コマ絵は素材を含んでいる' do + r = Panel.list_opt[:include] r[:panel_pictures].has_key?(:resource_picture).should be_true - end - it '素材は絵師を含んでいる' do - r = Panel.list_opt[:include] + end + it '素材は絵師を含んでいる' do + r = Panel.list_opt[:include] r[:panel_pictures][:resource_picture].has_key?(:artist).should be_true - end - it '素材はライセンスを含んでいる' do - r = Panel.list_opt[:include] + end + it '素材はライセンスを含んでいる' do + r = Panel.list_opt[:include] r[:panel_pictures][:resource_picture].has_key?(:license).should be_true - end - it 'フキダシを含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシを含んでいる' do + r = Panel.show_include_opt r.has_key?(:speech_balloons).should be_true - end - it 'フキダシはフキダシ枠を含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシはフキダシ枠を含んでいる' do + r = Panel.show_include_opt r[:speech_balloons].has_key?(:balloons).should be_true - end - it 'フキダシはセリフを含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシはセリフを含んでいる' do + r = Panel.show_include_opt r[:speech_balloons].has_key?(:speeches).should be_true - end - it '作家を含んでいる' do - r = Panel.list_opt[:include] + end + it '作家を含んでいる' do + r = Panel.list_opt[:include] r.has_key?(:author).should be_true - end - end - describe 'json一覧出力オプションに於いて' do - it 'includeキーを含んでいる' do - r = Panel.list_json_opt - r.has_key?(:include).should be_true - end - it '4つの項目を含んでいる' do - r = Panel.list_json_opt[:include] + end + end + describe 'json一覧出力オプションに於いて' do + it 'includeキーを含んでいる' do + r = Panel.list_json_opt + r.has_key?(:include).should be_true + end + it '4つの項目を含んでいる' do + r = Panel.list_json_opt[:include] r.should have(4).items - end - it 'コミックを含んでいる' do - r = Panel.list_json_opt[:include] + end + it 'コミックを含んでいる' do + r = Panel.list_json_opt[:include] r.has_key?(:comic).should be_true - end - it 'コマ絵を含んでいる' do - r = Panel.list_json_opt[:include] + end + it 'コマ絵を含んでいる' do + r = Panel.list_json_opt[:include] r.has_key?(:panel_pictures).should be_true - end - it 'コマ絵は素材を含んでいる' do - r = Panel.list_json_opt[:include] + end + it 'コマ絵は素材を含んでいる' do + r = Panel.list_json_opt[:include] r[:panel_pictures].has_key?(:resource_picture).should be_true - end - it '素材は絵師を含んでいる' do - r = Panel.list_json_opt[:include] + end + it '素材は絵師を含んでいる' do + r = Panel.list_json_opt[:include] r[:panel_pictures][:resource_picture].has_key?(:artist).should be_true - end - it '素材はライセンスを含んでいる' do - r = Panel.list_json_opt[:include] + end + it '素材はライセンスを含んでいる' do + r = Panel.list_json_opt[:include] r[:panel_pictures][:resource_picture].has_key?(:license).should be_true - end - it 'フキダシを含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシを含んでいる' do + r = Panel.show_include_opt r.has_key?(:speech_balloons).should be_true - end - it 'フキダシはフキダシ枠を含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシはフキダシ枠を含んでいる' do + r = Panel.show_include_opt r[:speech_balloons].has_key?(:balloons).should be_true - end - it 'フキダシはセリフを含んでいる' do - r = Panel.show_include_opt + end + it 'フキダシはセリフを含んでいる' do + r = Panel.show_include_opt r[:speech_balloons].has_key?(:speeches).should be_true - end - it '作家を含んでいる' do - r = Panel.list_json_opt[:include] + end + it '作家を含んでいる' do + r = Panel.list_json_opt[:include] r.has_key?(:author).should be_true - end + end + end + + #異常データ検出 + #コマはコミックに従属しなくなったのでtで入れ替えるチェックは要らなくなった + #コマ絵とフキダシの整合チェックをする + describe 'id収集に於いて' do + context 'つつがなく終わるとき' do + it '第一パラメータで指定された配列中から第二引数のidを収集している' do + a = [[{:panel_id => 1, :a => 'a'}, {:panel_id => 2, :a => 'a'}], + [{:panel_id => 3, :a => 'a'}, {:panel_id => 4, :a => 'a'}]] + r = Panel.collect_element_value a, :panel_id + r.should eq [1, 2, 3, 4] + end + end + context 'Nil除外指示があるとき' do + it '収集したpanel_idのうちnilは除外している' do + a = [[{:panel_id => 1, :a => 'a'}, {:panel_id => 2, :a => 'a'}, {:panel_id => nil, :a => 'a'}], + [{:panel_id => 3, :a => 'a'}, {:panel_id => nil, :a => 'a'}, {:panel_id => 4, :a => 'a'}]] + r = Panel.collect_element_value a, :panel_id, true + r.should eq [1, 2, 3, 4] + end + end + end + describe 'id一致チェックに於いて' do + #parent.idがNilのときはすべてNil。数値のときは全一致 + context '親が既存(idが数値)のとき' do + it 'すべてid一致するときTrueを返す' do + r = Panel.validate_id [1, 1, 1, 1], 1 + r.should be_true + end + it 'idが一致する中にNilが混じってもTrueを返す' do + r = Panel.validate_id [1, 1, 1, 1, nil], 1 + r.should be_true + end + it 'すべて数値でも一致しないときFalseを返す' do + r = Panel.validate_id [1, 1, 1, 1, 2], 1 + r.should be_false + end + it '数値とNilが混ざってもIDが一致しないときFalseを返す' do + r = Panel.validate_id [1, 1, nil, 2], 1 + r.should be_false + end + end + context '親が新規(idがNil)のとき' do + it 'すべてNilはTrueを返す' do + r = Panel.validate_id [ nil,nil,nil,nil], nil + r.should be_true + end + it 'すべてnilでなければFalseを返す' do + r = Panel.validate_id [nil,nil,nil,nil, 2], nil + r.should be_false + end + end + end + describe 'idチェック単体に於いて' do + before do +# @pp = Factory :panel_picture, :panel_id => @panel.id, :t => 1 + end + context 'つつがなく終わるとき' do + it 'idを収集依頼している' do + Panel.should_receive(:collect_element_value).with(any_args).exactly(1) + Panel.stub(:collect_element_value).with(any_args).and_return([]) + Panel.stub(:validate_id).with(any_args).and_return(true) + r = Panel.validate_element_id [], :panel_id, nil + end + it '収集したidを一致チェック依頼している' do + Panel.should_receive(:validate_id).with(any_args).exactly(1) + Panel.stub(:collect_element_value).with(any_args).and_return([]) + Panel.stub(:validate_id).with(any_args).and_return(true) + r = Panel.validate_element_id [], :panel_id, nil + end + end + #実データでチェック + #依頼チェックだけでは不安なので最低限のチェックを + context 'コマ新規のとき' do + it 'コマ絵で正常通過している' do + @panel = Factory.build :panel, :author_id => @author.id + @panel.panel_pictures.build( + Factory.attributes_for(:panel_picture, :panel_id => nil, :resource_picture_id => @rp.id, :t => nil) + ) + r = Panel.validate_element_id [@panel.panel_pictures, @panel.speech_balloons], :panel_id, @panel.id + r.should be_true + end + it 'フキダシで正常通過している' do + @panel = Factory.build :panel, :author_id => @author.id + @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => nil, :speech_balloon_template_id => @sbt.id) + ) + r = Panel.validate_element_id [@panel.panel_pictures, @panel.speech_balloons], :panel_id, @panel.id + r.should be_true + end + end + context 'コマ既存のとき' do + it 'コマ絵で正常通過している' do + @panel = Factory :panel, :author_id => @author.id + @panel.panel_pictures.build( + Factory.attributes_for(:panel_picture, :panel_id => @panel.id, :resource_picture_id => @rp.id, :t => nil) + ) + r = Panel.validate_element_id [@panel.panel_pictures, @panel.speech_balloons], :panel_id, @panel.id + r.should be_true + end + it 'フキダシで正常通過している' do + @panel = Factory :panel, :author_id => @author.id + @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id) + ) + r = Panel.validate_element_id [@panel.panel_pictures, @panel.speech_balloons], :panel_id, @panel.id + r.should be_true + end + end + context 'フキダシ新規のとき' do + it 'バルーンで正常通過している' do + @panel = Factory.build :panel, :author_id => @author.id + @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => nil, :speech_balloon_template_id => @sbt.id) + ) + @panel.speech_balloons.first.balloons.build( + Factory.attributes_for(:balloon, :speech_balloon_id => nil) + ) + r = Panel.validate_element_id [@panel.speech_balloons.first.speeches, @panel.speech_balloons.first.balloons], :speech_balloon_id, @panel.speech_balloons.first.id + r.should be_true + end + it 'セリフで正常通過している' do + @panel = Factory.build :panel, :author_id => @author.id + @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => nil, :speech_balloon_template_id => @sbt.id) + ) + @panel.speech_balloons.first.speeches.build( + Factory.attributes_for(:speech, :speech_balloon_id => nil) + ) + r = Panel.validate_element_id [@panel.speech_balloons.first.speeches, @panel.speech_balloons.first.balloons], :speech_balloon_id, @panel.speech_balloons.first.id + r.should be_true + end + end + end + describe 'idチェックリスト生成に於いて' do + before do + @panel = Factory.build :panel, :author_id => @author.id + end + context 'つつがなく終わるとき' do + it 'コマ部品とフキダシ部品のトータル2を返す' do + @panel.panel_pictures.build( + Factory.attributes_for(:panel_picture, :panel_id => nil, :resource_picture_id => @rp.id, :t => nil) + ) + @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => nil, :speech_balloon_template_id => @sbt.id) + ) + @panel.speech_balloons.first.balloons.build( + Factory.attributes_for(:balloon, :speech_balloon_id => nil) + ) + @panel.speech_balloons.first.speeches.build( + Factory.attributes_for(:speech, :speech_balloon_id => nil) + ) + r = @panel.validate_id_list + r.should have(2).items + end + it 'コマ部品とフキダシ部品[複数:2]のケースでトータル3を返す' do + @panel.panel_pictures.build( + Factory.attributes_for(:panel_picture, :panel_id => @panel.id, :resource_picture_id => @rp.id, :t => nil) + ) + sb1 = @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id) + ) + sb1.balloons.build( + Factory.attributes_for(:balloon, :speech_balloon_id => sb1.id) + ) + sb1.speeches.build( + Factory.attributes_for(:speech, :speech_balloon_id => sb1.id) + ) + sb2 = @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id) + ) + sb2.balloons.build( + Factory.attributes_for(:balloon, :speech_balloon_id => sb2.id) + ) + sb2.speeches.build( + Factory.attributes_for(:speech, :speech_balloon_id => sb2.id) + ) + r = @panel.validate_id_list + r.should have(3).items + end + end + end + describe 'idチェック複合に於いて' do + before do + @panel = Factory.build :panel, :author_id => @author.id + end + context 'つつがなく終わるとき' do + it 'コマ部品とフキダシ部品の二回チェック依頼している' do + Panel.should_receive(:validate_element_id).with(any_args).exactly(2) + Panel.stub(:validate_element_id).with(any_args).and_return(true) + @panel.panel_pictures.build( + Factory.attributes_for(:panel_picture, :panel_id => @panel.id, :resource_picture_id => @rp.id, :t => nil) + ) + sb1 = @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id) + ) + sb1.balloons.build( + Factory.attributes_for(:balloon, :speech_balloon_id => sb1.id) + ) + sb1.speeches.build( + Factory.attributes_for(:speech, :speech_balloon_id => sb1.id) + ) + r = Panel.validate_elements_id(@panel.validate_id_list) + end + end + end + describe 'シリアライズチェックに於いて' do + context 'つつがなく終わるとき' do + it '0からシリアライズされているならTrueを返す' do + r = Panel.validate_t [0, 1, 2] + r.should be_true + end + it '見た目はシリアライズされてなくてもソート結果が無事ならtrueを返す' do + r = Panel.validate_t [0, 2, 1] + r.should be_true + end + it '見た目はシリアライズされてなくてもソート結果が無事ならtrueを返す' do + r = Panel.validate_t [ 2, 1, 4, 3, 0] + r.should be_true + end + end + context '異常なとき' do + it '0から始まらないならFalseを返す' do + r = Panel.validate_t [1, 2, 3] + r.should be_false + end + it '連続していないならFalseを返す' do + r = Panel.validate_t [0, 1, 2, 4] + r.should be_false + end + it '連続していないならFalseを返す' do + r = Panel.validate_t [0, 1, 2, 4, 5] + r.should be_false + end + end + end + describe 'tチェック単体に於いて' do + before do + end + context 'つつがなく終わるとき' do + it 'コマ絵とフキダシのtを収集依頼している' do + Panel.should_receive(:collect_element_value).with(any_args).exactly(1) + Panel.stub(:collect_element_value).with(any_args).and_return([]) + Panel.stub(:validate_t).with(any_args).and_return(true) + r = Panel.validate_element_t [], :t + end + it '収集したtをシリアライズチェック依頼している' do + Panel.stub(:collect_element_value).with(any_args).and_return([]) + Panel.should_receive(:validate_t).with(any_args).exactly(1) + Panel.stub(:validate_t).with(any_args).and_return(true) + r = Panel.validate_element_t [], :t + end + end + #実データでチェック + #依頼チェックだけでは不安なので最低限のチェックを + context '新規のとき' do + it 'コマ絵で正常通過している' do + @panel = Factory.build :panel, :author_id => @author.id + @panel.panel_pictures.build( + Factory.attributes_for(:panel_picture, :panel_id => nil, :resource_picture_id => @rp.id, :t => nil) + ) + r = Panel.validate_element_t [@panel.panel_pictures, @panel.speech_balloons], :t + r.should be_true + end + it 'フキダシで正常通過している' do + @panel = Factory.build :panel, :author_id => @author.id + @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => nil, :speech_balloon_template_id => @sbt.id, :t => nil) + ) + r = Panel.validate_element_t [@panel.panel_pictures, @panel.speech_balloons], :t + r.should be_true + end + end + context '既存のとき' do + it 'コマ絵で正常通過している' do + @panel = Factory :panel, :author_id => @author.id + @panel.panel_pictures.build( + Factory.attributes_for(:panel_picture, :panel_id => @panel.id, :resource_picture_id => @rp.id, :t => 0) + ) + r = Panel.validate_element_t [@panel.panel_pictures, @panel.speech_balloons], :t + r.should be_true + end + it 'フキダシで正常通過している' do + @panel = Factory :panel, :author_id => @author.id + @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 0) + ) + r = Panel.validate_element_t [@panel.panel_pictures, @panel.speech_balloons], :t + r.should be_true + end + end + end + describe '複合チェックに於いて' do + context 'つつがなく終わるとき' do + it 'している' do + @panel = Factory.build :panel, :author_id => @author.id + @panel.panel_pictures.build( + Factory.attributes_for(:panel_picture, :panel_id => @panel.id, :resource_picture_id => @rp.id, :t => 0) + ) + @panel.panel_pictures.build( + Factory.attributes_for(:panel_picture, :panel_id => @panel.id, :resource_picture_id => @rp.id, :t => 1) + ) + sb1 = @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 2) + ) + sb1.balloons.build( + Factory.attributes_for(:balloon, :speech_balloon_id => sb1.id) + ) + sb1.speeches.build( + Factory.attributes_for(:speech, :speech_balloon_id => sb1.id) + ) + sb2 = @panel.speech_balloons.build( + Factory.attributes_for(:speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @sbt.id, :t => 3) + ) + sb2.balloons.build( + Factory.attributes_for(:balloon, :speech_balloon_id => sb2.id) + ) + sb2.speeches.build( + Factory.attributes_for(:speech, :speech_balloon_id => sb2.id) + ) + r = @panel.validate_child + r.should be_true + end + end end - -end +end diff --git a/spec/models/speech_balloon_spec.rb b/spec/models/speech_balloon_spec.rb index 746bfbdf..c7392fb5 100644 --- a/spec/models/speech_balloon_spec.rb +++ b/spec/models/speech_balloon_spec.rb @@ -7,15 +7,15 @@ describe SpeechBalloon do Factory :admin @user = Factory( :user_yas) @author = @user.author - @artist = Factory :artist_yas, :author_id => @author.id + @artist = Factory :artist_yas, :author_id => @author.id @license = Factory :license - @panel = Factory :panel + @panel = Factory :panel, :author_id => @author.id @speech_balloon_template = Factory :speech_balloon_template - end + end describe '検証に於いて' do - before do + before do end it 'オーソドックスなデータなら通る' do @@ -31,18 +31,10 @@ describe SpeechBalloon do @sb.panel_id = @panel.id @sb.should be_valid end - it 'nullなら失敗する' do - @sb.panel_id = nil - @sb.should_not be_valid - end it '数値でなければ失敗する' do @sb.panel_id = 'a' @sb.should_not be_valid end - it '存在するコマでなければ失敗する' do - @sb.panel_id = 0 - @sb.should_not be_valid - end end context 'speech_balloon_template_idを検証するとき' do before do @@ -119,5 +111,5 @@ describe SpeechBalloon do end end - + end diff --git a/spec/models/speech_balloon_template_spec.rb b/spec/models/speech_balloon_template_spec.rb index 3540bec1..7ddda413 100644 --- a/spec/models/speech_balloon_template_spec.rb +++ b/spec/models/speech_balloon_template_spec.rb @@ -142,23 +142,100 @@ describe SpeechBalloonTemplate do end end - describe '対象フキダシテンプレートの取得に於いて' do + describe 'システム画像置換に於いて' do before do - @st = Factory :speech_balloon_template + @sp = Factory :system_picture + @sp2 = Factory :system_picture + @st = Factory.build :speech_balloon_template + @hash = {"classname" => 'sore', "caption" => 'store test', + "templates" => { + "one" => {"balloon" => {"system_picture" => 'BASE64'}} + } + } + @hashs = {"classname" => 'sore2', "caption" => 'store test2', + "templates" => { + "one" => {"balloon" => {"system_picture" => 'DUAL'}}, + "two" => {"balloon" => {"system_picture" => 'BASE64ENC'}} + } + } end - context 'nameが一致するフキダシテンプレートがないとき' do - it '新規フキダシテンプレートを準備して返す' do - r = SpeechBalloonTemplate.update_speech_balloon_template 'newtemplate', {:classname => 'New'} - r.should be_a_new SpeechBalloonTemplate - r[:classname].should eq 'New' + context '事前チェック' do + it 'システム画像に保存を依頼している' do + SystemPicture.stub(:store).with(any_args).and_return(@sp) + SystemPicture.should_receive(:store).exactly(1) + r = @st.pic_rehash @hash end end - context 'nameが一致するフキダシテンプレートがあるとき' do - it '該当フキダシテンプレートを値設定して返す' do - r = SpeechBalloonTemplate.update_speech_balloon_template @st.name, {:classname => 'Update'} - r.is_a?(SpeechBalloonTemplate).should be_true - r.should_not be_a_new SpeechBalloonTemplate - r[:classname].should eq 'Update' + context 'つつがなく終わるとき' do + before do + SystemPicture.stub(:store).with(any_args).and_return(@sp) + end + it 'システム画像のidを作成している' do + r = @st.pic_rehash @hash + @hash["templates"]["one"]["balloon"].has_key?("system_picture_id").should be_true + @hash["templates"]["one"]["balloon"]["system_picture_id"].should eq @sp.id + end + it 'システム画像のテキストデータを削除している' do + r = @st.pic_rehash @hash + @hash["templates"]["one"]["balloon"].has_key?("system_picture").should_not be_true + end + it 'trueを返す' do + r = @st.pic_rehash @hash + r.should be_true + end + end + context 'システム画像の作成に失敗したとき' do + before do + SystemPicture.stub(:store).with(any_args).and_return(false) + end + it 'Falseを返す' do + r = @st.pic_rehash @hash + r.should be_false + end + end + context '複数のとき' do + before do + SystemPicture.stub(:store).with(any_args).and_return(@sp) + end + it 'システム画像のidを作成している' do + r = @st.pic_rehash @hashs + @hashs["templates"]["one"]["balloon"].has_key?("system_picture_id").should be_true + @hashs["templates"]["one"]["balloon"]["system_picture_id"].should eq @sp.id + @hashs["templates"]["two"]["balloon"].has_key?("system_picture_id").should be_true + @hashs["templates"]["two"]["balloon"]["system_picture_id"].should eq @sp.id + end + it 'システム画像のテキストデータを削除している' do + r = @st.pic_rehash @hashs + @hashs["templates"]["one"]["balloon"].has_key?("system_picture").should_not be_true + @hashs["templates"]["two"]["balloon"].has_key?("system_picture").should_not be_true + end + end + context '例外データのとき' do + it 'templatesがなくても何ごともなく続行する' do + r = @st.pic_rehash({}) + r.should be_true + end + it 'templatesが空でも何ごともなく続行する' do + r = @st.pic_rehash( {"templates" => nil}) + r.should be_true + end + it 'balloonがなくても何ごともなく続行する' do + r = @st.pic_rehash({"templates" => { + "one" => {} + }}) + r.should be_true + end + it 'balloonが空でも何ごともなく続行する' do + r = @st.pic_rehash({"templates" => { + "one" => {"balloon" => nil} + }}) + r.should be_true + end + it 'system_pictureがなくても何ごともなく続行する' do + r = @st.pic_rehash({"templates" => { + "one" => {"balloon" => {}} + }}) + r.should be_true end end end @@ -166,82 +243,92 @@ describe SpeechBalloonTemplate do describe 'フキダシテンプレート保存に於いて' do before do @st = Factory.build :speech_balloon_template + @hash = {"classname" => 'sore', "caption" => 'store test'} + end + context '事前チェック' do + it 'システム画像置換を依頼している' do + SpeechBalloonTemplate.any_instance.stub(:pic_rehash).with(@hash).and_return(true) + SpeechBalloonTemplate.any_instance.should_receive(:pic_rehash).exactly(1) + r = @st.store @hash + end end context 'つつがなく終わるとき' do - it '保存を問い合わせている' do - SpeechBalloonTemplate.any_instance.should_receive(:save).exactly(1) - @st.store + before do + SpeechBalloonTemplate.any_instance.stub(:pic_rehash).with(@hash).and_return(true) + end + it 'hashから取り出したclassnameをセットしている' do + @st.store @hash + @st.classname.should eq @hash["classname"] + end + it 'hashから取り出したcaptionをセットしている' do + @st.store @hash + @st.caption.should eq @hash["caption"] + end + it 'hashをテキスト化してsettingsにセットしている' do + @st.store @hash + @st.settings.should eq @hash.to_s end it 'フキダシテンプレートが作成されている' do lambda { - @st.store + @st.store @hash }.should change SpeechBalloonTemplate, :count end end + context 'システム画像置換が失敗したとき' do + before do + SpeechBalloonTemplate.any_instance.stub(:pic_rehash).with(@hash).and_return(false) + end + it 'Falseを返す' do + r = @st.store @hash + r.should be_false + end + end + context '保存が失敗したとき' do + before do + SpeechBalloonTemplate.any_instance.stub(:pic_rehash).with(@hash).and_return(true) + SpeechBalloonTemplate.any_instance.stub(:save).with(any_args).and_return(false) + end + it 'Falseを返す' do + r = @st.store @hash + r.should be_false + end + end end describe 'フキダシテンプレート更新に於いて' do before do @st = Factory :speech_balloon_template - @attr = {:name => @st.name, :classname => 'Update', :t => 0, :caption => 'yp', :settings => '{}'} - @newattr = {:name => @st.name, :classname => 'New', :t => 1, :caption => 'nw', :settings => '{}'} + @hash = {} end context 'つつがなく終わるとき' do - it '対象フキダシテンプレートを問い合わせている' do - SpeechBalloonTemplate.stub(:update_speech_balloon_template).with(any_args).and_return(SpeechBalloonTemplate.new(@attr)) - SpeechBalloonTemplate.should_receive(:update_speech_balloon_template).exactly(1) - SpeechBalloonTemplate.store @st.name, @attr + it '保存依頼している' do + SpeechBalloonTemplate.any_instance.stub(:store).with(@hash).and_return(true) + SpeechBalloonTemplate.should_receive(:store).exactly(1) + SpeechBalloonTemplate.store @st.name, @hash end context '新規のとき' do - it 'フキダシテンプレートを保存しようとしている' do - SpeechBalloonTemplate.any_instance.should_receive(:save).exactly(1) - SpeechBalloonTemplate.store 'newtemplate', @newattr - end - it 'フキダシテンプレートが作成されている' do - lambda { - SpeechBalloonTemplate.store 'newtemplate', @newattr - }.should change SpeechBalloonTemplate, :count + #新規作成をチェックしたいが、楽するために(storeが保存しないことを利用して)新規オブジェクト生成かでテスト + it 'フキダシテンプレートは新規オブジェクトである' do + SpeechBalloonTemplate.any_instance.stub(:store).with(@hash).and_return(true) + r = SpeechBalloonTemplate.store :newsbtname, @hash + r.should be_a_new SpeechBalloonTemplate end end context '更新のとき' do - it 'フキダシテンプレートを保存しようとしている' do - SpeechBalloonTemplate.any_instance.should_receive(:save).exactly(1) - SpeechBalloonTemplate.store @st.name, @attr - end - it 'フキダシテンプレートの数に変化がない' do - lambda { - SpeechBalloonTemplate.store @st.name, @attr - }.should_not change SpeechBalloonTemplate, :count + it '名前が一致するテンプレを返す' do + SpeechBalloonTemplate.any_instance.stub(:store).with(@hash).and_return(true) + r = SpeechBalloonTemplate.store @st.name, @hash + r.name.should eq @st.name + r.should_not be_a_new SpeechBalloonTemplate end end - it '属性が一致している' do - r = SpeechBalloonTemplate.store 'newtemplate', @newattr - r.classname.should eq 'New' - end - it '保存されたSpeechBalloonTemplateオブジェクトを返す' do - r = SpeechBalloonTemplate.store 'newtemplate', @newattr -p r.errors.full_messages - r.should_not be_a_new SpeechBalloonTemplate - end end context 'フキダシテンプレートの作成に失敗するとき' do before do - SpeechBalloonTemplate.any_instance.stub(:save).with(any_args).and_return(false) - end - context '新規のとき' do - it 'フキダシテンプレートに変化がない' do - lambda { - r = SpeechBalloonTemplate.store 'newtemplate', @newattr - }.should_not change License, :count - end - end - context '更新のとき' do - it 'フキダシテンプレート属性に変化がない' do - lambda { - r = SpeechBalloonTemplate.store @st.name, @attr - }.should_not change License.find(@st.id), :classname - end + SpeechBalloonTemplate.any_instance.stub(:store).with(any_args).and_return(false) end + #成功失敗に関わらずオブジェクトを返すのでテストのやりようがない + end end @@ -346,9 +433,9 @@ p r.errors.full_messages it '配列の中身は失敗したフキダシテンプレートオブジェクトが入っている' do r = SpeechBalloonTemplate.import(@tes) r[0].is_a?(SpeechBalloonTemplate).should be_true - r[0]["name"].should eq 'fail1' + r[0]["name"].should eq 'squareR@pettan.com' r[1].is_a?(SpeechBalloonTemplate).should be_true - r[1]["name"].should eq 'fail2' + r[1]["name"].should eq 'squareRR@pettan.com' end end end diff --git a/spec/models/speech_spec.rb b/spec/models/speech_spec.rb index 406b4aed..821f4360 100644 --- a/spec/models/speech_spec.rb +++ b/spec/models/speech_spec.rb @@ -1,156 +1,148 @@ # -*- encoding: utf-8 -*- -require 'spec_helper' - -describe Speech do - before do - Factory :admin - @license = Factory :license - @user = Factory( :user_yas) - @author = @user.author - - @panel = Factory :panel - @speech_balloon_template = Factory :speech_balloon_template +require 'spec_helper' + +describe Speech do + before do + Factory :admin + @license = Factory :license + @user = Factory( :user_yas) + @author = @user.author + + @panel = Factory :panel + @speech_balloon_template = Factory :speech_balloon_template @speech_balloon = Factory :speech_balloon, :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id end - - describe '検証に於いて' do - it 'オーソドックスなデータなら通る' do - @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id - @speech.should be_valid + + describe '検証に於いて' do + it 'オーソドックスなデータなら通る' do + @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id + @speech.should be_valid end - - context 'speech_balloon_idを検証するとき' do - before do - @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id - end - it 'テストデータの確認' do - @speech.speech_balloon_id = @speech_balloon.id - @speech.should be_valid - end - it 'nullなら失敗する' do - @speech.speech_balloon_id = nil - @speech.should_not be_valid - end - it '数値でなければ失敗する' do - @speech.speech_balloon_id = 'a' - @speech.should_not be_valid - end - it '存在するフキダシコミックでなければ失敗する' do - @speech.speech_balloon_id = 0 - @speech.should_not be_valid - end - end - context 'contentを検証するとき' do - end - context 'xを検証するとき' do - before do - @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id - end - it 'テストデータの確認' do - @speech.x = '1' - @speech.should be_valid - end - it 'nullなら失敗する' do - @speech.x = nil - @speech.should_not be_valid - end - it '数値でなければ失敗する' do - @speech.x = 'a' - @speech.should_not be_valid - end - it '0なら通る' do - @speech.x = '0' - @speech.should be_valid - end - it '負でも通る' do - @speech.x = -1 - @speech.should be_valid - end - end - context 'yを検証するとき' do - before do - @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id - end - it 'テストデータの確認' do - @speech.y = '1' - @speech.should be_valid - end - it 'nullなら失敗する' do - @speech.y = nil - @speech.should_not be_valid - end - it '数値でなければ失敗する' do - @speech.y = 'a' - @speech.should_not be_valid - end - it '0なら通る' do - @speech.y = '0' - @speech.should be_valid - end - it '負でも通る' do - @speech.y = -1 - @speech.should be_valid - end - end - context 'widthを検証するとき' do - before do - @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id - end - it 'テストデータの確認' do - @speech.width = 1 - @speech.should be_valid - end - it 'nullなら失敗する' do - @speech.width = nil - @speech.should_not be_valid - end - it '数値でなければ失敗する' do - @speech.width = 'a' - @speech.should_not be_valid - end - it '0なら失敗する' do - @speech.width = '0' - @speech.should_not be_valid - end - it '負でも失敗する' do - @speech.width = -1 - @speech.should_not be_valid - end - end - context 'heightを検証するとき' do - before do - @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id - end - it 'テストデータの確認' do - @speech.height = '1' - @speech.should be_valid - end - it 'nullなら失敗する' do - @speech.height = nil - @speech.should_not be_valid - end - it '数値でなければ失敗する' do - @speech.height = 'a' - @speech.should_not be_valid - end - it '0なら失敗する' do - @speech.height = '0' - @speech.should_not be_valid - end - it '負でも失敗する' do - @speech.height = -1 - @speech.should_not be_valid - end - end - context 'settingsを検証するとき' do - before do - @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id - end - it 'テストデータの確認' do - @speech.settings = '' - @speech.should be_valid - end - end - end - -end + + context 'speech_balloon_idを検証するとき' do + before do + @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id + end + it 'テストデータの確認' do + @speech.speech_balloon_id = @speech_balloon.id + @speech.should be_valid + end + it '数値でなければ失敗する' do + @speech.speech_balloon_id = 'a' + @speech.should_not be_valid + end + end + context 'contentを検証するとき' do + end + context 'xを検証するとき' do + before do + @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id + end + it 'テストデータの確認' do + @speech.x = '1' + @speech.should be_valid + end + it 'nullなら失敗する' do + @speech.x = nil + @speech.should_not be_valid + end + it '数値でなければ失敗する' do + @speech.x = 'a' + @speech.should_not be_valid + end + it '0なら通る' do + @speech.x = '0' + @speech.should be_valid + end + it '負でも通る' do + @speech.x = -1 + @speech.should be_valid + end + end + context 'yを検証するとき' do + before do + @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id + end + it 'テストデータの確認' do + @speech.y = '1' + @speech.should be_valid + end + it 'nullなら失敗する' do + @speech.y = nil + @speech.should_not be_valid + end + it '数値でなければ失敗する' do + @speech.y = 'a' + @speech.should_not be_valid + end + it '0なら通る' do + @speech.y = '0' + @speech.should be_valid + end + it '負でも通る' do + @speech.y = -1 + @speech.should be_valid + end + end + context 'widthを検証するとき' do + before do + @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id + end + it 'テストデータの確認' do + @speech.width = 1 + @speech.should be_valid + end + it 'nullなら失敗する' do + @speech.width = nil + @speech.should_not be_valid + end + it '数値でなければ失敗する' do + @speech.width = 'a' + @speech.should_not be_valid + end + it '0なら失敗する' do + @speech.width = '0' + @speech.should_not be_valid + end + it '負でも失敗する' do + @speech.width = -1 + @speech.should_not be_valid + end + end + context 'heightを検証するとき' do + before do + @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id + end + it 'テストデータの確認' do + @speech.height = '1' + @speech.should be_valid + end + it 'nullなら失敗する' do + @speech.height = nil + @speech.should_not be_valid + end + it '数値でなければ失敗する' do + @speech.height = 'a' + @speech.should_not be_valid + end + it '0なら失敗する' do + @speech.height = '0' + @speech.should_not be_valid + end + it '負でも失敗する' do + @speech.height = -1 + @speech.should_not be_valid + end + end + context 'settingsを検証するとき' do + before do + @speech = Factory.build :speech, :speech_balloon_id => @speech_balloon.id + end + it 'テストデータの確認' do + @speech.settings = '' + @speech.should be_valid + end + end + end + +end -- 2.11.0