diff --git a/spec/features/sessions_spec.rb b/spec/features/sessions_spec.rb index 4188728..6c44840 100644 --- a/spec/features/sessions_spec.rb +++ b/spec/features/sessions_spec.rb @@ -1,5 +1,5 @@ describe "sessions" do - let(:exists_user) { FactoryGirl.create(:user) } + let(:exists_user) { create(:user) } describe "the sign in process" do let(:submit_label) { I18n.t("terms.sign_in") } @@ -20,7 +20,7 @@ describe "sessions" do end context "sign in with non-exists user" do - let(:user) { FactoryGirl.build(:user) } + let(:user) { build(:user) } it "current location is not root_path" do current_path.should_not == root_path diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index d6bb86e..68146de 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -1,5 +1,5 @@ describe "users" do - let(:exists_user) { FactoryGirl.create(:user) } + let(:exists_user) { create(:user) } describe "edit" do let(:url) { user_path } diff --git a/spec/models/fluentd_spec.rb b/spec/models/fluentd_spec.rb index 5133ff7..f124e08 100644 --- a/spec/models/fluentd_spec.rb +++ b/spec/models/fluentd_spec.rb @@ -5,7 +5,7 @@ describe Fluentd do let(:path) { fluentd.send(column) } subject do - fluentd.check_permission(column) + fluentd.check_permission(column) fluentd.errors end @@ -55,7 +55,7 @@ describe Fluentd do end end - let(:fluentd) { FactoryGirl.build(:fluentd) } + let(:fluentd) { build(:fluentd) } describe "#valid?" do before do diff --git a/spec/models/login_token_spec.rb b/spec/models/login_token_spec.rb index 4481ecc..87c7c61 100644 --- a/spec/models/login_token_spec.rb +++ b/spec/models/login_token_spec.rb @@ -7,10 +7,10 @@ describe LoginToken do before do active.times do |n| - FactoryGirl.create(:login_token, expired_at: (n + 1).day.from_now) + create(:login_token, expired_at: (n + 1).day.from_now) end inactive.times do |n| - FactoryGirl.create(:login_token, expired_at: (n + 1).day.ago) + create(:login_token, expired_at: (n + 1).day.ago) end end diff --git a/spec/models/plugin_spec.rb b/spec/models/plugin_spec.rb index 02a2316..3f60678 100644 --- a/spec/models/plugin_spec.rb +++ b/spec/models/plugin_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Plugin do - let(:plugin) { FactoryGirl.build(:plugin) } + let(:plugin) { build(:plugin) } before do Plugin.stub(:gemfile_path).and_return { Rails.root + "tmp/fluentd-ui-test-gemfile.plugins" } @@ -110,7 +110,7 @@ describe Plugin do end describe "#uninstall!" do - let(:installed_plugin) { FactoryGirl.build(:plugin, gem_name: "fluent-plugin-foobar") } + let(:installed_plugin) { build(:plugin, gem_name: "fluent-plugin-foobar") } before do installed_plugin.stub(:fluent_gem).and_return { true } @@ -127,7 +127,7 @@ describe Plugin do end describe "#upgrade!" do - let(:installed_plugin) { FactoryGirl.build(:plugin, gem_name: "fluent-plugin-foobar", version: current_version) } + let(:installed_plugin) { build(:plugin, gem_name: "fluent-plugin-foobar", version: current_version) } let(:current_version) { "1.0.0" } let(:target_version) { "1.2.0" } @@ -155,7 +155,7 @@ describe Plugin do end describe "#latest_version?" do - let(:plugin) { FactoryGirl.build(:plugin, version: gem_version.to_s) } + let(:plugin) { build(:plugin, version: gem_version.to_s) } let(:gem_version) { Gem::Version.new("1.0.0") } before do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 6206fa8..0ff9930 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe User do - let(:user) { FactoryGirl.build(:user) } + let(:user) { build(:user) } describe "#valid?" do it { user.should be_valid } @@ -13,7 +13,7 @@ describe User do end it "taken name is invalid" do - another_user = FactoryGirl.create(:user) + another_user = create(:user) user.name = another_user.name user.should_not be_valid end