From bb9d4e9b08dc786cb78b18f1a7ac38440353bc7e Mon Sep 17 00:00:00 2001 From: AlexanderBlair Date: Wed, 2 Mar 2016 12:19:40 +0000 Subject: [PATCH 1/2] Test Importer commit Test importer attempting to create a CSV importer, plus updates to gemfile.lock --- Gemfile.lock | 259 +++++++++++++--------- app/classes/importers/test_importer.rb | 25 +++ app/controllers/csv_uploads_controller.rb | 1 + app/models/test.rb | 15 ++ db/schema.rb | 67 ++---- 5 files changed, 217 insertions(+), 150 deletions(-) create mode 100644 app/classes/importers/test_importer.rb create mode 100644 app/models/test.rb diff --git a/Gemfile.lock b/Gemfile.lock index f202748..53c289a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,37 +1,37 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.2.8) - actionmailer (4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) + CFPropertyList (2.3.2) + actionmailer (4.1.14.2) + actionpack (= 4.1.14.2) + actionview (= 4.1.14.2) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.8) - actionview (= 4.1.8) - activesupport (= 4.1.8) + actionpack (4.1.14.2) + actionview (= 4.1.14.2) + activesupport (= 4.1.14.2) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.8) - activesupport (= 4.1.8) + actionview (4.1.14.2) + activesupport (= 4.1.14.2) builder (~> 3.1) erubis (~> 2.7.0) - active_model_serializers (0.9.0) + active_model_serializers (0.9.4) activemodel (>= 3.2) - activemodel (4.1.8) - activesupport (= 4.1.8) + activemodel (4.1.14.2) + activesupport (= 4.1.14.2) builder (~> 3.1) - activerecord (4.1.8) - activemodel (= 4.1.8) - activesupport (= 4.1.8) + activerecord (4.1.14.2) + activemodel (= 4.1.14.2) + activesupport (= 4.1.14.2) arel (~> 5.0.0) - activesupport (4.1.8) + activesupport (4.1.14.2) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) - bcrypt (3.1.9) + bcrypt (3.1.10) bcrypt-ruby (3.1.5) bcrypt (>= 3.1.3) builder (3.2.2) @@ -40,21 +40,22 @@ GEM activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.8.0) - columnize (0.8.9) + coffee-script-source (1.10.0) + columnize (0.9.0) + concurrent-ruby (1.0.1) debugger (1.6.8) columnize (>= 0.3.1) debugger-linecache (~> 1.2.0) debugger-ruby_core_source (~> 1.3.5) debugger-linecache (1.2.0) - debugger-ruby_core_source (1.3.7) - devise (3.4.1) + debugger-ruby_core_source (1.3.8) + devise (3.5.6) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -63,123 +64,170 @@ GEM warden (~> 1.2.3) diff-lcs (1.2.5) erubis (2.7.0) - excon (0.41.0) - execjs (2.2.2) + excon (0.47.0) + execjs (2.6.0) fission (0.5.0) CFPropertyList (~> 2.2) - fog (1.25.0) + fog (1.37.0) + fog-aliyun (>= 0.1.0) + fog-atmos + fog-aws (>= 0.6.0) fog-brightbox (~> 0.4) - fog-core (~> 1.25) + fog-core (~> 1.32) + fog-dynect (~> 0.0.2) + fog-ecloud (~> 0.1) + fog-google (<= 0.1.0) fog-json + fog-local + fog-powerdns (>= 0.1.1) fog-profitbricks fog-radosgw (>= 0.0.2) + fog-riakcs fog-sakuracloud (>= 0.0.4) + fog-serverlove fog-softlayer + fog-storm_on_demand fog-terremark fog-vmfusion fog-voxel + fog-vsphere (>= 0.4.0) + fog-xenserver fog-xml (~> 0.1.1) ipaddress (~> 0.5) - nokogiri (~> 1.5, >= 1.5.11) - opennebula - fog-brightbox (0.7.0) + fog-aliyun (0.1.0) + fog-core (~> 1.27) + fog-json (~> 1.0) + ipaddress (~> 0.8) + xml-simple (~> 1.1) + fog-atmos (0.1.0) + fog-core + fog-xml + fog-aws (0.8.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-brightbox (0.10.1) fog-core (~> 1.22) fog-json inflecto (~> 0.0.2) - fog-core (1.25.0) + fog-core (1.36.0) builder - excon (~> 0.38) + excon (~> 0.45) formatador (~> 0.2) - mime-types - net-scp (~> 1.1) - net-ssh (>= 2.1.3) - fog-json (1.0.0) - multi_json (~> 1.0) - fog-profitbricks (0.0.1) + fog-dynect (0.0.2) + fog-core + fog-json + fog-xml + fog-ecloud (0.3.0) + fog-core + fog-xml + fog-google (0.1.0) + fog-core + fog-json + fog-xml + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.2.1) + fog-core (~> 1.27) + fog-powerdns (0.1.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-profitbricks (0.0.5) fog-core fog-xml nokogiri - fog-radosgw (0.0.3) + fog-radosgw (0.0.5) fog-core (>= 1.21.0) fog-json fog-xml (>= 0.0.1) - fog-sakuracloud (0.1.1) + fog-riakcs (0.1.0) + fog-core + fog-json + fog-xml + fog-sakuracloud (1.7.5) + fog-core + fog-json + fog-serverlove (0.1.2) fog-core fog-json - fog-softlayer (0.3.24) + fog-softlayer (1.1.0) fog-core fog-json - fog-terremark (0.0.3) + fog-storm_on_demand (0.1.1) + fog-core + fog-json + fog-terremark (0.1.0) fog-core fog-xml - fog-vmfusion (0.0.1) + fog-vmfusion (0.1.0) fission fog-core - fog-voxel (0.0.1) + fog-voxel (0.1.0) fog-core fog-xml - fog-xml (0.1.1) + fog-vsphere (0.6.0) + fog-core + rbvmomi (~> 1.8) + fog-xenserver (0.2.3) + fog-core + fog-xml + fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - foreigner (1.7.0) + foreigner (1.7.4) activerecord (>= 3.0.0) formatador (0.2.5) - hike (1.2.3) - i18n (0.6.11) + i18n (0.7.0) inflecto (0.0.2) - ipaddress (0.8.0) - jquery-rails (3.1.2) + ipaddress (0.8.3) + jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) - libv8 (3.16.14.7) + json (1.8.3) + libv8 (3.16.14.13) mail (2.6.3) mime-types (>= 1.16, < 3) - mime-types (2.4.3) - mini_portile (0.6.1) - minitest (5.4.3) - multi_json (1.10.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (2.9.1) - nokogiri (1.6.5) - mini_portile (~> 0.6.0) - opennebula (4.10.1) - json - nokogiri - rbvmomi + mime-types (2.99.1) + mini_portile2 (2.0.0) + minitest (5.8.4) + multi_json (1.11.2) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) orm_adapter (0.5.0) - pg (0.17.1) - rack (1.5.2) - rack-test (0.6.2) + pg (0.18.4) + rack (1.5.5) + rack-test (0.6.3) rack (>= 1.0) - rails (4.1.8) - actionmailer (= 4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) - activemodel (= 4.1.8) - activerecord (= 4.1.8) - activesupport (= 4.1.8) + rails (4.1.14.2) + actionmailer (= 4.1.14.2) + actionpack (= 4.1.14.2) + actionview (= 4.1.14.2) + activemodel (= 4.1.14.2) + activerecord (= 4.1.14.2) + activesupport (= 4.1.14.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.8) + railties (= 4.1.14.2) sprockets-rails (~> 2.0) - railties (4.1.8) - actionpack (= 4.1.8) - activesupport (= 4.1.8) + railties (4.1.14.2) + actionpack (= 4.1.14.2) + activesupport (= 4.1.14.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.0) + rake (10.5.0) rbvmomi (1.8.2) builder nokogiri (>= 1.4.1) trollop - ref (1.0.5) + ref (2.0.0) responders (1.1.2) railties (>= 3.2, < 4.2) - rspec-core (2.14.5) - rspec-expectations (2.14.3) + rspec-core (2.14.8) + rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.3) + rspec-mocks (2.14.6) rspec-rails (2.14.0) actionpack (>= 3.0) activesupport (>= 3.0) @@ -187,37 +235,37 @@ GEM rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) - sass (3.2.19) - sass-rails (4.0.5) + sass (3.4.21) + sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.2) - sprockets (~> 2.8, < 3.0) - sprockets-rails (~> 2.0) - spring (1.2.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.1) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + spring (1.6.4) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) - therubyracer (0.12.1) + sqlite3 (1.3.11) + therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - trollop (2.0) + thread_safe (0.3.5) + tilt (2.0.2) + trollop (2.1.2) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.3) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - warden (1.2.3) + warden (1.2.6) rack (>= 1.0) + xml-simple (1.1.5) PLATFORMS ruby @@ -240,3 +288,6 @@ DEPENDENCIES sqlite3 therubyracer uglifier + +BUNDLED WITH + 1.11.2 diff --git a/app/classes/importers/test_importer.rb b/app/classes/importers/test_importer.rb new file mode 100644 index 0000000..6328320 --- /dev/null +++ b/app/classes/importers/test_importer.rb @@ -0,0 +1,25 @@ +class TestImporter < RowImporter + + def object + @tst + end + + def read_row(values, logger) + @tst = find_or_new + + + + attempt_to_overwrite!(@tst) + @tst.name = values[1] + @tst.data = values[2] + + save_with_status! + end + + private + + def self.ar_class + TestImporter + end + +end diff --git a/app/controllers/csv_uploads_controller.rb b/app/controllers/csv_uploads_controller.rb index 4bd42d2..224f948 100644 --- a/app/controllers/csv_uploads_controller.rb +++ b/app/controllers/csv_uploads_controller.rb @@ -55,6 +55,7 @@ def traits ToughnessMeasurementImporter, WeatherReadingImporter, WoodDensityImporter, + TestImporter, ] end diff --git a/app/models/test.rb b/app/models/test.rb new file mode 100644 index 0000000..c61b5ff --- /dev/null +++ b/app/models/test.rb @@ -0,0 +1,15 @@ +class test < ActiveRecord::Base + include BatchImport + + include CSVImportTable + + include ValidatePlotAndDate + include ValidateTreeTag + + require 'csv' + CSV.foreach(file.path, headers: true) do |row| + test.create! row.to_hash + end +end + +end \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 4f20ee8..5b75c18 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150908092248) do +ActiveRecord::Schema.define(version: 20160223112950) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -602,6 +602,15 @@ add_index "herbivories", ["leaf_id"], name: "index_herbivories_on_leaf_id", using: :btree + create_table "herbivories_unused", force: true do |t| + t.integer "branch_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "batch_id" + end + + add_index "herbivories_unused", ["branch_id"], name: "index_herbivories_unused_on_branch_id", using: :btree + create_table "ingrowth_core_imports", force: true do |t| t.string "plot_code", null: false t.integer "year", null: false @@ -872,48 +881,6 @@ add_index "light_hangings", ["tree_id"], name: "index_light_hangings_on_tree_id", using: :btree - create_table "light_photon_measurements", force: true do |t| - t.integer "light_hanging_id" - t.datetime "datetime" - t.integer "record" - t.float "m0" - t.float "m0_5" - t.float "m1" - t.float "m1_5" - t.float "m2" - t.float "m2_5" - t.float "m3" - t.float "m3_5" - t.float "m4" - t.float "m4_5" - t.float "m5" - t.float "m6" - t.float "m7" - t.float "m8" - t.float "m9" - t.float "m10" - t.float "m11" - t.float "m12" - t.float "m13" - t.float "m14" - t.float "m15" - t.float "m16" - t.float "m17" - t.float "m18" - t.float "m19" - t.float "m20" - t.float "m21" - t.float "m22" - t.float "m23" - t.float "m24" - t.float "m25" - t.float "m26" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "light_photon_measurements", ["light_hanging_id"], name: "index_light_photon_measurements_on_light_hanging_id", using: :btree - create_table "light_references", force: true do |t| t.integer "number" t.datetime "datetime" @@ -1254,7 +1221,7 @@ t.integer "batch_id" end - add_index "plots", ["plot_code"], name: "index_plots_on_plot_code", unique: true, using: :btree + add_index "plots", ["plot_code", "fp_id"], name: "index_plots_on_plot_code_and_fp_id", unique: true, using: :btree add_index "plots", ["site_id"], name: "index_plots_on_site_id", using: :btree create_table "region_countries", force: true do |t| @@ -2194,6 +2161,13 @@ add_index "sub_plots", ["plot_id", "sub_plot_code"], name: "index_sub_plots_on_plot_id_and_sub_plot_code", unique: true, using: :btree add_index "sub_plots", ["plot_id"], name: "index_sub_plots_on_plot_id", using: :btree + create_table "tests", force: true do |t| + t.string "name" + t.integer "data" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "toughness_measurements", force: true do |t| t.integer "branch_id", null: false t.datetime "date", null: false @@ -2293,6 +2267,7 @@ add_index "wood_densities", ["branch_id", "branch_type"], name: "index_wood_densities_on_branch_id_and_branch_type", unique: true, using: :btree add_index "wood_densities", ["branch_id"], name: "index_wood_densities_on_branch_id", using: :btree + Foreigner.load add_foreign_key "branch_architectures", "branches", name: "branch_architectures_branch_id_fk" add_foreign_key "branch_light_placements", "branches", name: "branch_light_placements_branch_id_fk" @@ -2337,6 +2312,8 @@ add_foreign_key "hemi_photos", "trees", name: "hemi_photos_tree_id_fk" + add_foreign_key "herbivories_unused", "branches", name: "herbivories_branch_id_fk" + add_foreign_key "ingrowth_core_values", "ingrowth_cores", name: "ingrowth_core_values_ingrowth_core_id_fk" add_foreign_key "ingrowth_cores", "plots", name: "ingrowth_cores_plot_id_fk" @@ -2359,8 +2336,6 @@ add_foreign_key "light_hangings", "trees", name: "light_hangings_tree_id_fk" - add_foreign_key "light_photon_measurements", "light_hangings", name: "light_photon_measurements_light_hanging_id_fk" - add_foreign_key "light_references", "plots", name: "light_references_plot_id_fk" add_foreign_key "litterfall_traps", "plots", name: "litterfall_traps_plot_id_fk" From 346c81f3b7561e5502dd988fca65becd3f2d082b Mon Sep 17 00:00:00 2001 From: AlexanderBlair Date: Wed, 13 Apr 2016 13:24:14 +0100 Subject: [PATCH 2/2] Test Importer Changes Have been trying to test the Test Importer using rspec. This is my code so far, having issues when trying to run the test script, which I will outline in the comments --- app/classes/importers/test_importer.rb | 6 +--- app/classes/importers/usc_wax.rb | 31 +++++++++++++++++++ app/controllers/csv_uploads_controller.rb | 1 + app/models/test.rb | 8 ++--- app/models/usc_wax.rb | 2 ++ db/migrate/20160406124433_create_usc_waxes.rb | 14 +++++++++ db/schema.rb | 7 ++++- rails | 0 spec/classes/importers/test_importer_spec.rb | 22 +++++++++++++ spec/models/usc_wax_spec.rb | 5 +++ spec/spec_helper.rb | 3 +- 11 files changed, 87 insertions(+), 12 deletions(-) create mode 100644 app/classes/importers/usc_wax.rb create mode 100644 app/models/usc_wax.rb create mode 100644 db/migrate/20160406124433_create_usc_waxes.rb create mode 100644 rails create mode 100644 spec/classes/importers/test_importer_spec.rb create mode 100644 spec/models/usc_wax_spec.rb diff --git a/app/classes/importers/test_importer.rb b/app/classes/importers/test_importer.rb index 6328320..8b2dbe4 100644 --- a/app/classes/importers/test_importer.rb +++ b/app/classes/importers/test_importer.rb @@ -6,13 +6,9 @@ def object def read_row(values, logger) @tst = find_or_new - - - - attempt_to_overwrite!(@tst) + attempt_to_overwrite!(@tst) @tst.name = values[1] @tst.data = values[2] - save_with_status! end diff --git a/app/classes/importers/usc_wax.rb b/app/classes/importers/usc_wax.rb new file mode 100644 index 0000000..e476e23 --- /dev/null +++ b/app/classes/importers/usc_wax.rb @@ -0,0 +1,31 @@ +class UscWaxImporter < RowImporter + + def object + @wi + end + + def read_row(values, logger) + + @wi = find_or_new({ + :branch => find_or_create_branch(values[1]), + + }) + attempt_to_overwrite!(@wi) + + @wi.sun_shade = values[2] + @wi.uscname = values[3] + @wi.weight = values[4] + @wi.d_18o_lw = values[5] + @wi.dD_lw = values[6] + @wi.punch = values[8] + + save_with_status! + end + + private + + def self.ar_class + Wax Measurement + end + +end \ No newline at end of file diff --git a/app/controllers/csv_uploads_controller.rb b/app/controllers/csv_uploads_controller.rb index 224f948..9904838 100644 --- a/app/controllers/csv_uploads_controller.rb +++ b/app/controllers/csv_uploads_controller.rb @@ -56,6 +56,7 @@ def traits WeatherReadingImporter, WoodDensityImporter, TestImporter, + ] end diff --git a/app/models/test.rb b/app/models/test.rb index c61b5ff..bfdb2e3 100644 --- a/app/models/test.rb +++ b/app/models/test.rb @@ -1,4 +1,6 @@ -class test < ActiveRecord::Base +class Test < ActiveRecord::Base + require 'csv' + include BatchImport include CSVImportTable @@ -6,9 +8,7 @@ class test < ActiveRecord::Base include ValidatePlotAndDate include ValidateTreeTag - require 'csv' - CSV.foreach(file.path, headers: true) do |row| - test.create! row.to_hash + end end diff --git a/app/models/usc_wax.rb b/app/models/usc_wax.rb new file mode 100644 index 0000000..196a63d --- /dev/null +++ b/app/models/usc_wax.rb @@ -0,0 +1,2 @@ +class UscWax < ActiveRecord::Base +end diff --git a/db/migrate/20160406124433_create_usc_waxes.rb b/db/migrate/20160406124433_create_usc_waxes.rb new file mode 100644 index 0000000..59c6892 --- /dev/null +++ b/db/migrate/20160406124433_create_usc_waxes.rb @@ -0,0 +1,14 @@ +class CreateUscWaxes < ActiveRecord::Migration + def change + create_table :usc_waxes do |t| + + t.references :branch, index: true + t.sun_shade :sun_shade + t.string :uscname, index: true + t.float :weight + t.interger :d18o_lw + end + + + end +end diff --git a/db/schema.rb b/db/schema.rb index 5b75c18..0f5529e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160223112950) do +ActiveRecord::Schema.define(version: 20160406124433) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -2207,6 +2207,11 @@ add_index "trees", ["sub_plot_id"], name: "index_trees_on_sub_plot_id", using: :btree add_index "trees", ["tree_code", "sub_plot_id"], name: "index_trees_on_tree_code_and_sub_plot_id", unique: true, using: :btree + create_table "usc_waxes", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "users", force: true do |t| t.string "email", default: "", null: false t.string "encrypted_password", default: "", null: false diff --git a/rails b/rails new file mode 100644 index 0000000..e69de29 diff --git a/spec/classes/importers/test_importer_spec.rb b/spec/classes/importers/test_importer_spec.rb new file mode 100644 index 0000000..6e14fa0 --- /dev/null +++ b/spec/classes/importers/test_importer_spec.rb @@ -0,0 +1,22 @@ +require 'spec_helper' +require 'csv' +require 'importer' + +describe TestImporter do + it_behaves_like 'Importer' + +it 'can read CSV' do + + values = CSV.parse_line '1,ABCDEFG' + + importer = TestImporter.new(1, 2) + status = importer.read_row(values, Array.new) + expect(status).to eq(Lookup::ImportStatus.inserted) + + b = importer.object.reload + expect(b).to be_valid + expect(b.name).to eq('1') + expect(b.data).to eq('ABCDEFG') + end +end + \ No newline at end of file diff --git a/spec/models/usc_wax_spec.rb b/spec/models/usc_wax_spec.rb new file mode 100644 index 0000000..4622b0b --- /dev/null +++ b/spec/models/usc_wax_spec.rb @@ -0,0 +1,5 @@ +require 'spec_helper' + +describe UscWax do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 32a0164..943bc19 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,6 +2,7 @@ ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' +require 'rspec/autorun' # Requires supporting ruby files with custom matchers and macros, etc, # in spec/support/ and its subdirectories. @@ -38,6 +39,4 @@ # the seed, which is printed after each run. # --seed 1234 config.order = "random" - - config.include ContextHelper end