diff --git a/Gemfile b/Gemfile index abbf8a4..2224b5d 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,4 @@ source "https://rubygems.org" gemspec gem 'sqlite3', :platforms => :ruby -gem 'rails', '5.1.4' \ No newline at end of file +gem 'rails', '5.1.4' diff --git a/aasm.gemspec b/aasm.gemspec index 9645efa..b29fa72 100644 --- a/aasm.gemspec +++ b/aasm.gemspec @@ -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") diff --git a/spec/database.rb b/spec/database.rb index 3a00bd8..ac3505a 100644 --- a/spec/database.rb +++ b/spec/database.rb @@ -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 diff --git a/spec/generators/active_record_generator_spec.rb b/spec/generators/active_record_generator_spec.rb index 0d696ce..db0f763 100644 --- a/spec/generators/active_record_generator_spec.rb +++ b/spec/generators/active_record_generator_spec.rb @@ -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 diff --git a/spec/models/active_record/job.rb b/spec/models/active_record/job.rb deleted file mode 100644 index 9cd9e7b..0000000 --- a/spec/models/active_record/job.rb +++ /dev/null @@ -1,3 +0,0 @@ -class Job < ActiveRecord::Base - include AASM -end diff --git a/spec/models/active_record/work.rb b/spec/models/active_record/work.rb new file mode 100644 index 0000000..c836f8c --- /dev/null +++ b/spec/models/active_record/work.rb @@ -0,0 +1,3 @@ +class Work < ActiveRecord::Base + include AASM +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4dcc3c7..a9aadf7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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'])