diff --git a/lib/tasks/sample_data.rake b/lib/tasks/sample_data.rake
index d05cf70..e6fbc5b 100644
--- a/lib/tasks/sample_data.rake
+++ b/lib/tasks/sample_data.rake
@@ -8,7 +8,7 @@ namespace :db do
users = User.all
users.each do |u|
- champ_name = Faker::Commerce.product_name
+ champ_name = Emoji.all.sample.name
u.champion = Champion.create!(name: champ_name)
end
end
diff --git a/lib/user_builder.rb b/lib/user_builder.rb
index a9fc2c5..f9fba1f 100644
--- a/lib/user_builder.rb
+++ b/lib/user_builder.rb
@@ -4,7 +4,7 @@ def build auth
user = User.create(name: auth["info"]["nickname"],
uid: auth["uid"],
)
- champion = Champion.create(name: User.all_champions.sample,
+ champion = Champion.create(name: Emoji.all.sample.name,
user_id: user.id,
)
end
diff --git a/spec/controllers/challenges_controller_spec.rb b/spec/controllers/challenges_controller_spec.rb
index eaff81a..9cbf0fc 100644
--- a/spec/controllers/challenges_controller_spec.rb
+++ b/spec/controllers/challenges_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
describe ChallengesController do
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 702c559..dee0f7c 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
describe SessionsController do
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 142455c..27acb63 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
describe UsersController do
diff --git a/spec/helpers/challenges_helper_spec.rb b/spec/helpers/challenges_helper_spec.rb
index d0841bb..d60292e 100644
--- a/spec/helpers/challenges_helper_spec.rb
+++ b/spec/helpers/challenges_helper_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
# Specs in this file have access to a helper object that includes
# the ChallengesHelper. For example:
diff --git a/spec/helpers/sessions_helper_spec.rb b/spec/helpers/sessions_helper_spec.rb
index cc4c89d..8003b8b 100644
--- a/spec/helpers/sessions_helper_spec.rb
+++ b/spec/helpers/sessions_helper_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
# Specs in this file have access to a helper object that includes
# the SessionsHelper. For example:
diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
index 5073928..32f3073 100644
--- a/spec/helpers/users_helper_spec.rb
+++ b/spec/helpers/users_helper_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
# Specs in this file have access to a helper object that includes
# the UsersHelper. For example:
diff --git a/spec/models/challenge_spec.rb b/spec/models/challenge_spec.rb
index 3ee4138..f69ce0b 100644
--- a/spec/models/challenge_spec.rb
+++ b/spec/models/challenge_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
describe Challenge do
subject(:challenge) { described_class.create(description: "being the ugliest") }
diff --git a/spec/models/champion_spec.rb b/spec/models/champion_spec.rb
index 81313ba..b778972 100644
--- a/spec/models/champion_spec.rb
+++ b/spec/models/champion_spec.rb
@@ -1,5 +1,5 @@
-require 'spec_helper'
+require 'rails_helper'
describe Champion do
- pending "add some examples to (or delete) #{__FILE__}"
+
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 36da80f..6581118 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
describe User do
subject(:user) { described_class.create(name: "TwitterName", wins: 0, losses: 0) }
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
new file mode 100644
index 0000000..51f5efc
--- /dev/null
+++ b/spec/rails_helper.rb
@@ -0,0 +1,2 @@
+require 'spec_helper'
+
diff --git a/spec/requests/user_pages_spec.rb b/spec/requests/user_pages_spec.rb
index de617eb..44d960b 100644
--- a/spec/requests/user_pages_spec.rb
+++ b/spec/requests/user_pages_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
describe "UserPages" do
subject { page }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4d8661b..39de47e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,57 +1,42 @@
-require 'simplecov'
-SimpleCov.start
-
+# This file is copied to spec/ when you run 'rails generate rspec:install'
ENV["RAILS_ENV"] ||= 'test'
require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'rspec/autorun'
-require 'database_cleaner'
-#require 'capybara/rspec'
-
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
-
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
RSpec.configure do |config|
-
+ # ## Mock Framework
+ #
+ # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+ #
+ # config.mock_with :mocha
+ # config.mock_with :flexmock
+ # config.mock_with :rr
+
+ # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"
+ # If you're not using ActiveRecord, or you'd prefer not to run each of your
+ # examples within a transaction, remove the following line or assign false
+ # instead of true.
config.use_transactional_fixtures = true
+ # If true, the base class of anonymous controllers will be inferred
+ # automatically. This will be the default behavior in future versions of
+ # rspec-rails.
config.infer_base_class_for_anonymous_controllers = false
+ # Run specs in random order to surface order dependencies. If you find an
+ # order dependency and want to debug it, you can fix the order by providing
+ # the seed, which is printed after each run.
+ # --seed 1234
config.order = "random"
-
- def login_with_oauth(service = :twitter)
- get "/auth/#{service}/callback"
- end
-
- def login_success(service = :twitter)
- visit "/auth/#{service}/callback"
- end
-
- def login_failure
- visit "/auth/failure"
- end
-
- # Capybara
- config.include Capybara::DSL
-
- # Database Cleaner
- config.before(:suite) do
- DatabaseCleaner.strategy = :transaction
- DatabaseCleaner.clean_with(:truncation)
- end
-
- config.before(:each) do
- DatabaseCleaner.start
- end
-
- config.after(:each) do
- DatabaseCleaner.clean
- end
-
end
-