releaf 1.1.19 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 66b042a43f8433c1e1675fac44836485fe43d0cd25f9c391d185317e2d693732
-  data.tar.gz: 4b142f0ecd20328e7bb6b0f22a9b027cb2b0b583821644a596a2af733c13cf7d
+SHA1:
+  metadata.gz: eeeefdd3d3479208c2e862e1ac06617dc5a9bd8e
+  data.tar.gz: d557b989fded089d5a180e6216e62751377fc22e
 SHA512:
-  metadata.gz: dc3ae22247c9008facb4a71b10378370032cd05daf7d1619f05e8d5f4efb7ca994f0534ad70c31efb80be180061f609882017892d79439e2b35ea612f1b51a74
-  data.tar.gz: 93cc1b538cb93c6fd893f53a05100aa9d863f78104cc2e780447d798e950f47ee2be5d5d22625b34047e1c04d553b2323f701d2bfba393937cc55e80e973ded1
+  metadata.gz: f702e960bfefbef5d6deebb14b2a40d646f377582bbff039453966eac001b734dc31037db3ad3837227677a620775aa6dd5f6e93fd9309339d92be7fd816b080
+  data.tar.gz: d413347ab13e9041465a46e2b62d451073b7263e01ebec3e6c522b59412e8cde593703ed7cf10f74043762d79da58e9616a8c3a593c53faf6812dfc46741ce77

data/lib/releaf/rspec/features_matchers.rb

@@ -37,22 +37,31 @@ module Capybara
     #     e.g., the label text or the id of the textarea
     # @return [true] whether errors has been found otherwise will raise Capybara::ElementNotFound exception
     def has_error?(error_message, options = {})
-      error_exists = false
+      error_found = false
       if options[:field]
         first('.field.has-error', minimum: 1) # wait for any errors to come from validation
-        all(".field.has-error").each do
-          if find(:field, options[:field]) && first(".error", text: error_message)
-            error_exists = true
-            break
+        all(".field.has-error").each do |field_container|
+          if !error_found
+            within(field_container) do
+              if has_field?(options[:field], wait: false) && has_css?(".error", text: error_message, wait: false)
+                error_found = true
+              end
+            end
           end
         end
       else
         if first(".form-error-box .error", text: error_message)
-          error_exists = true
+          error_found = true
         end
       end
 
-      raise Capybara::ElementNotFound.new("Unable to find given error message") unless error_exists
+      unless error_found
+        failure_text = "Unable to find error message #{error_message.inspect}"
+        if options[:field]
+          failure_text += " on field #{options[:field].inspect}"
+        end
+        raise Capybara::ElementNotFound.new failure_text
+      end
 
       true
     end

data/lib/releaf/version.rb

@@ -1,3 +1,3 @@
 module Releaf
-  VERSION = "1.1.19"
+  VERSION = "1.1.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf
 version: !ruby/object:Gem::Version
-  version: 1.1.19
+  version: 1.1.20
 platform: ruby
 authors:
 - CubeSystems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: releaf-core
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.19
+        version: 1.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.19
+        version: 1.1.20
 - !ruby/object:Gem::Dependency
   name: releaf-i18n_database
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.19
+        version: 1.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.19
+        version: 1.1.20
 - !ruby/object:Gem::Dependency
   name: releaf-permissions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.19
+        version: 1.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.19
+        version: 1.1.20
 - !ruby/object:Gem::Dependency
   name: releaf-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.19
+        version: 1.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.19
+        version: 1.1.20
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -345,26 +345,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Administration interface for Ruby on Rails
 test_files:
-- spec/factories/node_route.rb
-- spec/factories/publisher.rb
-- spec/factories/node.rb
+- spec/factories/author.rb
 - spec/factories/banner_page.rb
 - spec/factories/book.rb
+- spec/factories/chapter.rb
 - spec/factories/common.rb
 - spec/factories/home_page.rb
-- spec/factories/author.rb
+- spec/factories/node.rb
+- spec/factories/node_route.rb
+- spec/factories/publisher.rb
 - spec/factories/role.rb
 - spec/factories/text_page.rb
 - spec/factories/user.rb
-- spec/factories/chapter.rb
-- spec/support/wait_steps.rb
 - spec/support/controller_macros.rb
 - spec/support/excel_helpers.rb
 - spec/support/shared/service_includer.rb
-- spec/spec_helper.rb
+- spec/support/wait_steps.rb
 - spec/rails_helper.rb
+- spec/spec_helper.rb