From 2652abd4ec76ad974e9765abb411fec9e4db9246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Bo=CC=88ttger?= Date: Sat, 11 Jul 2015 22:36:07 +1200 Subject: [PATCH] extract Sequel test models into model files --- spec/models/sequel/sequel_multiple.rb | 25 +++++++++++++++++ spec/models/sequel/sequel_simple.rb | 25 +++++++++++++++++ .../sequel_persistence_multiple_spec.rb | 26 +---------------- .../persistence/sequel_persistence_spec.rb | 28 ++++--------------- 4 files changed, 56 insertions(+), 48 deletions(-) create mode 100644 spec/models/sequel/sequel_multiple.rb create mode 100644 spec/models/sequel/sequel_simple.rb diff --git a/spec/models/sequel/sequel_multiple.rb b/spec/models/sequel/sequel_multiple.rb new file mode 100644 index 0000000..c17209e --- /dev/null +++ b/spec/models/sequel/sequel_multiple.rb @@ -0,0 +1,25 @@ +db = Sequel.connect(SEQUEL_DB) + +# if you want to see the statements while running the spec enable the following line +# db.loggers << Logger.new($stderr) +db.create_table(:multiples) do + primary_key :id + String :status +end + +class SequelMultiple < Sequel::Model(db) + set_dataset(:multiples) + include AASM + + attr_accessor :default + + aasm :left, :column => :status + aasm :left do + state :alpha, :initial => true + state :beta + state :gamma + event :release do + transitions :from => [:alpha, :beta, :gamma], :to => :beta + end + end +end diff --git a/spec/models/sequel/sequel_simple.rb b/spec/models/sequel/sequel_simple.rb new file mode 100644 index 0000000..bc84f2b --- /dev/null +++ b/spec/models/sequel/sequel_simple.rb @@ -0,0 +1,25 @@ +db = Sequel.connect(SEQUEL_DB) + +# if you want to see the statements while running the spec enable the following line +# db.loggers << Logger.new($stderr) +db.create_table(:simples) do + primary_key :id + String :status +end + +class SequelSimple < Sequel::Model(db) + set_dataset(:simples) + include AASM + + attr_accessor :default + + aasm :column => :status + aasm do + state :alpha, :initial => true + state :beta + state :gamma + event :release do + transitions :from => [:alpha, :beta, :gamma], :to => :beta + end + end +end diff --git a/spec/unit/persistence/sequel_persistence_multiple_spec.rb b/spec/unit/persistence/sequel_persistence_multiple_spec.rb index 2142963..f17244a 100644 --- a/spec/unit/persistence/sequel_persistence_multiple_spec.rb +++ b/spec/unit/persistence/sequel_persistence_multiple_spec.rb @@ -9,31 +9,7 @@ describe 'sequel' do end before(:all) do - db = Sequel.connect(SEQUEL_DB) - - # if you want to see the statements while running the spec enable the following line - # db.loggers << Logger.new($stderr) - db.create_table(:models) do - primary_key :id - String :status - end - - @model = Class.new(Sequel::Model(db)) do - set_dataset(:models) - include AASM - - attr_accessor :default - - aasm :left, :column => :status - aasm :left do - state :alpha, :initial => true - state :beta - state :gamma - event :release do - transitions :from => [:alpha, :beta, :gamma], :to => :beta - end - end - end + @model = SequelMultiple end describe "instance methods" do diff --git a/spec/unit/persistence/sequel_persistence_spec.rb b/spec/unit/persistence/sequel_persistence_spec.rb index fd3eec0..ff103f6 100644 --- a/spec/unit/persistence/sequel_persistence_spec.rb +++ b/spec/unit/persistence/sequel_persistence_spec.rb @@ -4,30 +4,12 @@ describe 'sequel' do require 'logger' require 'spec_helper' + Dir[File.dirname(__FILE__) + "/../../models/sequel/*.rb"].sort.each do |f| + require File.expand_path(f) + end + before(:all) do - db = Sequel.connect(SEQUEL_DB) - - # if you want to see the statements while running the spec enable the following line - # db.loggers << Logger.new($stderr) - db.create_table(:models) do - primary_key :id - String :status - end - - @model = Class.new(Sequel::Model(db)) do - set_dataset(:models) - attr_accessor :default - include AASM - aasm :column => :status - aasm do - state :alpha, :initial => true - state :beta - state :gamma - event :release do - transitions :from => [:alpha, :beta, :gamma], :to => :beta - end - end - end + @model = SequelSimple end describe "instance methods" do