Fix specs, rename job model to work
This commit is contained in:
parent
4b7f22611f
commit
17cd78d832
2
Gemfile
2
Gemfile
|
@ -3,4 +3,4 @@ source "https://rubygems.org"
|
|||
gemspec
|
||||
|
||||
gem 'sqlite3', :platforms => :ruby
|
||||
gem 'rails', '5.1.4'
|
||||
gem 'rails', '5.1.4'
|
||||
|
|
|
@ -23,11 +23,10 @@ Gem::Specification.new do |s|
|
|||
s.add_development_dependency 'rspec', ">= 3"
|
||||
s.add_development_dependency 'generator_spec'
|
||||
s.add_development_dependency 'appraisal'
|
||||
|
||||
|
||||
# debugging
|
||||
# s.add_development_dependency 'debugger'
|
||||
s.add_development_dependency 'pry'
|
||||
s.add_development_dependency 'pry-nav'
|
||||
|
||||
s.files = `git ls-files`.split("\n")
|
||||
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
||||
|
|
|
@ -20,8 +20,7 @@ ActiveRecord::Migration.suppress_messages do
|
|||
t.string "right"
|
||||
end
|
||||
|
||||
ActiveRecord::Migration.create_table "jobs", :force => true do |t|
|
||||
t.string "state"
|
||||
ActiveRecord::Migration.create_table "works", :force => true do |t|
|
||||
t.string "status"
|
||||
end
|
||||
|
||||
|
|
|
@ -44,9 +44,9 @@ if defined?(ActiveRecord)
|
|||
end
|
||||
|
||||
it "dont add column if column is already exists" do
|
||||
require 'models/active_record/job.rb'
|
||||
require 'models/active_record/work.rb'
|
||||
load_schema
|
||||
run_generator %w(job status)
|
||||
run_generator %w(work status)
|
||||
assert_no_migration "db/migrate/add_status_to_jobs.rb"
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
class Job < ActiveRecord::Base
|
||||
include AASM
|
||||
end
|
|
@ -0,0 +1,3 @@
|
|||
class Work < ActiveRecord::Base
|
||||
include AASM
|
||||
end
|
|
@ -13,7 +13,6 @@ SEQUEL_DB = defined?(JRUBY_VERSION) ? 'jdbc:sqlite::memory:' : 'sqlite:/'
|
|||
|
||||
def load_schema
|
||||
require 'logger'
|
||||
require 'yaml'
|
||||
config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
|
||||
ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
|
||||
ActiveRecord::Base.establish_connection(config['sqlite3'])
|
||||
|
|
Loading…
Reference in New Issue