Merge branch 'master' into mongoid-3

Conflicts: spec/models/problem_spec.rb

Merge branch 'master' into mongoid-3
Conflicts: spec/models/problem_spec.rb
Cyril Mougel
2 parents 74b76ef2 ecc4f777
Showing 4 changed files with 25 additions and 24 deletions Show diff stats
CHANGELOG.md
app/models/problem.rb
spec/models/app_spec.rb
spec/models/problem_spec.rb
-## 0.2.0 - Not released Yet
+## 0.2.0 - 2013-09-11
 ### Improvements
@@ -39,7 +39,7 @@ class Problem
   has_many :errs, :inverse_of => :problem, :dependent => :destroy
   has_many :comments, :inverse_of => :err, :dependent => :destroy
-  validates_presence_of :error_class, :environment
+  validates_presence_of :environment
   before_create :cache_app_attributes
@@ -165,31 +165,44 @@ describe App do
   end
   context '#find_or_create_err!' do
-    before do
-      @app = Fabricate(:app)
-      @conditions = {
+    let(:app) { Fabricate(:app) }
+    let(:conditions) { {
         :error_class  => 'Whoops',
         :environment  => 'production',
         :fingerprint  => 'some-finger-print'
       }
-    end
+    }
     it 'returns the correct err if one already exists' do
-      existing = Fabricate(:err, @conditions.merge(:problem => Fabricate(:problem, :app => @app)))
-      Err.where(@conditions).first.should == existing
-      @app.find_or_create_err!(@conditions).should == existing
+      existing = Fabricate(:err, conditions.merge(:problem => Fabricate(:problem, :app => app)))
+      Err.where(conditions).first.should == existing
+      app.find_or_create_err!(conditions).should == existing
     end
     it 'assigns the returned err to the given app' do
-      @app.find_or_create_err!(@conditions).app.should == @app
+      app.find_or_create_err!(conditions).app.should == app
     end
     it 'creates a new problem if a matching one does not already exist' do
-      Err.where(@conditions).first.should be_nil
+      Err.where(conditions).first.should be_nil
       lambda {
-        @app.find_or_create_err!(@conditions)
+        app.find_or_create_err!(conditions)
       }.should change(Problem,:count).by(1)
     end
+
+    context "without error_class" do
+      let(:conditions) { {
+        :environment  => 'production',
+        :fingerprint  => 'some-finger-print'
+      }
+      }
+      it 'save the err' do
+        Err.where(conditions).first.should be_nil
+        lambda {
+          app.find_or_create_err!(conditions)
+        }.should change(Problem,:count).by(1)
+      end
+    end
   end
   describe ".find_by_api_key!" do
@@ -3,12 +3,6 @@ require &#39;spec_helper&#39;
 describe Problem do
   context 'validations' do
-    it 'requires a error_class' do
-      err = Fabricate.build(:problem, :error_class => nil)
-      err.should_not be_valid
-      err.errors[:error_class].should include("can't be blank")
-    end
-
     it 'requires an environment' do
       err = Fabricate.build(:problem, :environment => nil)
       err.should_not be_valid
@@ -70,7 +64,6 @@ describe Problem do
     end
   end
-
   context '#message' do
     it "adding a notice caches its message" do
       err = Fabricate(:err)
@@ -81,7 +74,6 @@ describe Problem do
     end
   end
-
   context 'being created' do
     context 'when the app has err notifications set to false' do
       it 'should not send an email notification' do
@@ -92,7 +84,6 @@ describe Problem do
     end
   end
-
   context "#resolved?" do
     it "should start out as unresolved" do
       problem = Problem.new
@@ -108,7 +99,6 @@ describe Problem do
     end
   end
-
   context "resolve!" do
     it "marks the problem as resolved" do
       problem = Fabricate(:problem)
@@ -202,7 +192,6 @@ describe Problem do
     end
   end
-
   context "notice counter cache" do
     before do
       @app = Fabricate(:app)
@@ -229,7 +218,6 @@ describe Problem do
     end
   end
-
   context "#app_name" do
     let!(:app) { Fabricate(:app) }
     let!(:problem) { Fabricate(:problem, :app => app) }
1	-## 0.2.0 - Not released Yet	1	+## 0.2.0 - 2013-09-11
2		2
3	### Improvements	3	### Improvements
4		4
	@@ -39,7 +39,7 @@ class Problem		@@ -39,7 +39,7 @@ class Problem
39	has_many :errs, :inverse_of => :problem, :dependent => :destroy	39	has_many :errs, :inverse_of => :problem, :dependent => :destroy
40	has_many :comments, :inverse_of => :err, :dependent => :destroy	40	has_many :comments, :inverse_of => :err, :dependent => :destroy
41		41
42	- validates_presence_of :error_class, :environment	42	+ validates_presence_of :environment
43		43
44	before_create :cache_app_attributes	44	before_create :cache_app_attributes
45		45