Skip to content

Commit

Permalink
Added transpec changed to rspec 2.99.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jasnow committed Jun 3, 2014
1 parent 3c1777d commit 427396d
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion spec/controllers/microposts_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe MicropostsController do
describe MicropostsController, :type => :controller do
render_views

describe "access control" do
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/pages_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe PagesController do
describe PagesController, :type => :controller do
render_views

before(:each) do
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/relationships_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe RelationshipsController do
describe RelationshipsController, :type => :controller do

describe "access control" do

Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/sessions_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe SessionsController do
describe SessionsController, :type => :controller do
render_views

describe "GET 'new'" do
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/users_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe UsersController do
describe UsersController, :type => :controller do
render_views

describe "GET 'show'" do
Expand Down
2 changes: 1 addition & 1 deletion spec/models/micropost_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe Micropost do
describe Micropost, :type => :model do
before(:each) do
@user = FactoryGirl.create(:user)
@attr = { :content => "value for content" }
Expand Down
2 changes: 1 addition & 1 deletion spec/models/relationship_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe Relationship do
describe Relationship, :type => :model do

before(:each) do
@follower = FactoryGirl.create(:user)
Expand Down
6 changes: 3 additions & 3 deletions spec/models/user_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe User do
describe User, :type => :model do
before(:each) do
@attr = {
:name => "Example User",
Expand Down Expand Up @@ -170,11 +170,11 @@
end

it "should be true if the passwords match" do
@user.has_password?(@attr[:password]).should be true
expect(@user.has_password?(@attr[:password])).to be true
end

it "should be false if the passwords do not match" do
@user.has_password?("invalid").should be false
expect(@user.has_password?("invalid")).to be false
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/requests/friendly_forwardings_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe "FriendlyForwardings" do
describe "FriendlyForwardings", :type => :request do

describe "GET /friendly_forwardings" do
it "should forward to the requested page after signin" do
Expand Down
2 changes: 1 addition & 1 deletion spec/requests/layout_links_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe "LayoutLinks" do
describe "LayoutLinks", :type => :request do

describe "when not signed in" do
it "should have a signin link" do
Expand Down
2 changes: 1 addition & 1 deletion spec/requests/microposts_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe "Microposts" do
describe "Microposts", :type => :request do

before(:each) do
user = FactoryGirl.create(:user)
Expand Down
2 changes: 1 addition & 1 deletion spec/requests/users_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'

describe "Users" do
describe "Users", :type => :request do
describe "signup" do
describe "failure" do
it "should not make a new user" do
Expand Down

0 comments on commit 427396d

Please sign in to comment.