Skip to content

Commit

Permalink
updated github url to new org name: zebrunner
Browse files Browse the repository at this point in the history
  • Loading branch information
vdelendik committed Jun 29, 2021
1 parent 147ec4c commit 9f12b6f
Show file tree
Hide file tree
Showing 18 changed files with 39 additions and 38 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributing to carina

## Git configuration
1). **Fork repository** `https://github.com/qaprosoft/carina` to your own user.
1). **Fork repository** `https://github.com/zebrunner/carina` to your own user.

2). **Clone your fork to your local machine**:

Expand All @@ -21,4 +21,4 @@ And then after adding files (`git add` ...) use `git commit` (add description) a

git push origin work_local_branch:work_remote_branch

And on [https://github.com/qaprosoft/carina](https://github.com/qaprosoft/carina) you will see possibility to "Compare & Pull Request"
And on [https://github.com/zebrunner/carina](https://github.com/zebrunner/carina) you will see possibility to "Compare & Pull Request"
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ Carina is a Java-based test automation framework that unites all testing layers:
![Alt text](./docs/img/carina_space.png "Carina Overview")

## Sponsor
[Zebrunner](https://zebrunner.com) The first cloud-based Selenium hub with by-minute pricing. No limitations by threads number!<br>
[<b>Try it out for free.</b>](https://zebrunner.com)
<p align="center">
<a href="https://zebrunner.com/"><img alt="Zebrunner" src="./docs/img/zebrunner_intro.png"></a>
</p>

## Documentation and free support
* [User Manual](http://zebrunner.github.io/carina)
* [Demo Project](https://github.com/qaprosoft/carina-demo)
* [User Guide](http://zebrunner.github.io/carina)
* [Demo Project](https://github.com/zebrunner/carina-demo)
* [Telegram Channel](https://t.me/qps_carina)

## Code formatter
We propose to use our configured [**Java code formatter for Eclipse**](https://github.com/qaprosoft/carina/blob/master/carina_formatter.xml). To use same formatter in IntelliJ IDEA you should install and configure [**Eclipse Code Formatter**](https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter).
We offer to use our configured [**Java code formatter for Eclipse**](https://github.com/zebrunner/carina/blob/master/carina_formatter.xml). To use the same formatter in IntelliJ IDEA you should install and configure [**Eclipse Code Formatter**](https://plugins.jetbrains.com/plugin/6546-eclipse-code-formatter).

## License
Code - [Apache Software License v2.0](http://www.apache.org/licenses/LICENSE-2.0)
Expand Down
2 changes: 1 addition & 1 deletion archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</developer>
</developers>
<scm>
<url>https://github.com/qaprosoft/carina.git</url>
<url>https://github.com/zebrunner/carina.git</url>
</scm>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* IAbstractTest - base test for UI and API tests.
*/

// https://github.com/qaprosoft/carina/issues/951
// https://github.com/zebrunner/carina/issues/951
// reused com.nordstrom.tools.testng-foundation to register ordered listeners

// on start order is TestRunListener and CarinaListener
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class FtpUtils {
private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final int DEFAULT_PORT = 21;

//TODO: https://github.com/qaprosoft/carina/issues/954
//TODO: https://github.com/zebrunner/carina/issues/954
// migrate FtpUtils methods to use com.qaprosoft.carina.core.foundation.utils.async.AsyncOperation
private static int uploading = 0;

Expand Down
10 changes: 5 additions & 5 deletions docs/advanced/database.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ For integration with DB, we recommend to use [MyBatis](http://www.mybatis.org/my
```

## Mappers
The next step is MyBatis mappers implementation, read [the official documentation](http://www.mybatis.org/mybatis-3/sqlmap-xml.html) to understand all the details. Let's place all the mappers into **src/main/resources/mappers**. Here is a [UserMapper.xml](https://github.com/qaprosoft/carina-demo/blob/master/src/main/resources/mappers/UserMapper.xml) sample:
The next step is MyBatis mappers implementation, read [the official documentation](http://www.mybatis.org/mybatis-3/sqlmap-xml.html) to understand all the details. Let's place all the mappers into **src/main/resources/mappers**. Here is a [UserMapper.xml](https://github.com/zebrunner/carina-demo/blob/master/src/main/resources/mappers/UserMapper.xml) sample:
```xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
Expand Down Expand Up @@ -147,7 +147,7 @@ The next step is MyBatis mappers implementation, read [the official documentatio
</mapper>
```

Now we have to implement a DB domain object [User class](https://github.com/qaprosoft/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/db/models/User.java) which reflects the DB table structure:
Now we have to implement a DB domain object [User class](https://github.com/zebrunner/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/db/models/User.java) which reflects the DB table structure:
```
package com.qaprosoft.carina.demo.db.models;
Expand Down Expand Up @@ -238,7 +238,7 @@ public class User {
}
```

Also, we have to describe the mapper interface, [UserMapper interface](https://github.com/qaprosoft/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/db/mappers/UserMapper.java):
Also, we have to describe the mapper interface, [UserMapper interface](https://github.com/zebrunner/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/db/mappers/UserMapper.java):

```
package com.qaprosoft.carina.demo.db.mappers;
Expand Down Expand Up @@ -307,7 +307,7 @@ All the mappers and reference to _database.properties should be specified in **s
```

## Connection factory
Connection factory is responsible for MyBatis context initialization and creation of mapper instances, take a look at the sample implementation of [ConnectionFactory](https://github.com/qaprosoft/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/utils/ConnectionFactory.java):
Connection factory is responsible for MyBatis context initialization and creation of mapper instances, take a look at the sample implementation of [ConnectionFactory](https://github.com/zebrunner/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/utils/ConnectionFactory.java):
```
package com.qaprosoft.carina.demo.utils;
Expand Down Expand Up @@ -349,7 +349,7 @@ public class ConnectionFactory {
```

## Usage sample
Finally, [DBSampleTest](https://github.com/qaprosoft/carina-demo/blob/master/src/test/java/com/qaprosoft/carina/demo/DBSampleTest.java) illustrates the usage of MyBatis in tests:
Finally, [DBSampleTest](https://github.com/zebrunner/carina-demo/blob/master/src/test/java/com/qaprosoft/carina/demo/DBSampleTest.java) illustrates the usage of MyBatis in tests:
```
package com.qaprosoft.carina.demo;
Expand Down
2 changes: 1 addition & 1 deletion docs/advanced/dataprovider.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dataprovider usage

Modern test automation frameworks should support data-driven testing, when you are able to verify a variety of edge cases providing test data sets into the tests using external data sources. Carina is not an exception, the framework supports multiple ways of test parametrization (see the [samples](https://github.com/qaprosoft/carina-demo/blob/master/src/test/java/com/qaprosoft/carina/demo/DataprovidersSampleTest.java)):
Modern test automation frameworks should support data-driven testing, when you are able to verify a variety of edge cases providing test data sets into the tests using external data sources. Carina is not an exception, the framework supports multiple ways of test parametrization (see the [samples](https://github.com/zebrunner/carina-demo/blob/master/src/test/java/com/qaprosoft/carina/demo/DataprovidersSampleTest.java)):

* Java data-providers
* XML parametrization
Expand Down
10 changes: 5 additions & 5 deletions docs/advanced/localization.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ There is an enhanced L10N utility to support localized (L10N) test automation t
## Prerequisites

Localized resources should be located in [**src/main/resources/L10N**](https://github.com/qaprosoft/carina-demo/tree/master/src/main/resources/L10N) folder.
Localized resources should be located in [**src/main/resources/L10N**](https://github.com/zebrunner/carina-demo/tree/master/src/main/resources/L10N) folder.
Each localized resource file has unique keys with translated values.
> Verify that there is a must have file without any postfix like [locale.properties](https://github.com/qaprosoft/carina-demo/blob/master/src/main/resources/L10N/locale.properties). This file will be considered as a default localization.
> Verify that there is a must have file without any postfix like [locale.properties](https://github.com/zebrunner/carina-demo/blob/master/src/main/resources/L10N/locale.properties). This file will be considered as a default localization.
## Implementation

Define parameters in [_config.properties](https://github.com/qaprosoft/carina-demo/blob/master/src/main/resources/_config.properties).
Define parameters in [_config.properties](https://github.com/zebrunner/carina-demo/blob/master/src/main/resources/_config.properties).
```
#Localization language
locale=de_DE
Expand Down Expand Up @@ -59,7 +59,7 @@ Carina will automatically compare text from the page with text from your locale_
Every mismatch will be collected in L10N.class.
>To assert collected assertions use `L10N.assertAll()` method.
If you want to do it manually use [`L10N.getText(key)`](https://github.com/qaprosoft/carina-demo/blob/64b63927e8c3a1a76d5e567e28f837be82797d56/src/test/java/com/qaprosoft/carina/demo/WebLocalizationSample.java#L53)
If you want to do it manually use [`L10N.getText(key)`](https://github.com/zebrunner/carina-demo/blob/64b63927e8c3a1a76d5e567e28f837be82797d56/src/test/java/com/qaprosoft/carina/demo/WebLocalizationSample.java#L53)
to get expected translations from resources:
```
String welcomeText = wikipediaLocalePage.getWelcomeText();
Expand Down Expand Up @@ -91,7 +91,7 @@ public void testAddNewLanguages() {
```
## Finding elements with a help of locales

Declare elements with [L10N](https://github.com/qaprosoft/carina-demo/blob/64b63927e8c3a1a76d5e567e28f837be82797d56/src/main/java/com/qaprosoft/carina/demo/gui/pages/localizationSample/WikipediaLocalePage.java#L26)
Declare elements with [L10N](https://github.com/zebrunner/carina-demo/blob/64b63927e8c3a1a76d5e567e28f837be82797d56/src/main/java/com/qaprosoft/carina/demo/gui/pages/localizationSample/WikipediaLocalePage.java#L26)
prefix where needed.
Use key after the ":" sign in @FindBy annotations which will be replaced by actual localized translations.

Expand Down
16 changes: 8 additions & 8 deletions docs/advanced/program_flow.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

Under the hood Carina use TestNG framework, so the first class to initialize is RemoteTestNGStarter.class. Program life cycle logic could be observed at [TestNG.class](https://github.com/cbeust/testng/blob/master/src/main/java/org/testng/TestNG.java) run() method.

The initializing turn comes to Carina when [CarinaListenerChain.class](https://github.com/qaprosoft/carina/blob/master/carina-core/src/main/java/com/qaprosoft/carina/core/foundation/listeners/CarinaListenerChain.java) object created.
The initializing turn comes to Carina when [CarinaListenerChain.class](https://github.com/zebrunner/carina/blob/master/carina-core/src/main/java/com/qaprosoft/carina/core/foundation/listeners/CarinaListenerChain.java) object created.
It extends [ListenerChain.class](http://javadox.com/com.nordstrom.tools/testng-foundation/1.10.0/com/nordstrom/automation/testng/package-summary.html)
which will create, sort and attach [AbstractTest.class](https://github.com/qaprosoft/carina/blob/master/carina-core/src/main/java/com/qaprosoft/carina/core/foundation/AbstractTest.java) listeners. This whole sequence is described in [TestRunner.class](https://github.com/cbeust/testng/blob/master/src/main/java/org/testng/TestRunner.java) init() method.
which will create, sort and attach [AbstractTest.class](https://github.com/zebrunner/carina/blob/master/carina-core/src/main/java/com/qaprosoft/carina/core/foundation/AbstractTest.java) listeners. This whole sequence is described in [TestRunner.class](https://github.com/cbeust/testng/blob/master/src/main/java/org/testng/TestRunner.java) init() method.

[AbstractTest.class](https://github.com/qaprosoft/carina/blob/master/carina-core/src/main/java/com/qaprosoft/carina/core/foundation/AbstractTest.java) listeners are:
[AbstractTest.class](https://github.com/zebrunner/carina/blob/master/carina-core/src/main/java/com/qaprosoft/carina/core/foundation/AbstractTest.java) listeners are:

```
@LinkedListeners({ CarinaListener.class, TestRunListener.class, DataProviderInterceptor.class })
Expand All @@ -16,12 +16,12 @@ Theese listeners being attached and created when transform(IListenersAnnotation

* `TestRunListener.class` and `DataProviderInterceptor.class` are implemented in zebrunner.

* [CarinaListener.class](https://github.com/qaprosoft/carina/blob/master/carina-core/src/main/java/com/qaprosoft/carina/core/foundation/listeners/CarinaListener.java)
* [CarinaListener.class](https://github.com/zebrunner/carina/blob/master/carina-core/src/main/java/com/qaprosoft/carina/core/foundation/listeners/CarinaListener.java)
as it comes from the name is a Carina's listener.

Because CarinaListener object created, the class static field is initialized in it. There are several important steps inside:

* R.reinit(). This method load's default values for all parameters from [carina-core](https://github.com/qaprosoft/carina/blob/master/carina-core/src/main/resources)
* R.reinit(). This method load's default values for all parameters from [carina-core](https://github.com/zebrunner/carina/blob/master/carina-core/src/main/resources)
, then override's them with users configuration (api.properties, config.properties, testdata.properties, email.properties, report.properties, database.properties).
* Configure log4j properties
* Initializing L10N feature.
Expand Down Expand Up @@ -53,7 +53,7 @@ public void webTest() {
}
```

Debug entry point at : [AbstractPage](https://github.com/qaprosoft/carina/blob/master/carina-webdriver/src/main/java/com/qaprosoft/carina/core/gui/AbstractPage.java) constructor and [IDriverPool](https://github.com/qaprosoft/carina/blob/master/carina-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/IDriverPool.java) getDriver() method.
Debug entry point at : [AbstractPage](https://github.com/zebrunner/carina/blob/master/carina-webdriver/src/main/java/com/qaprosoft/carina/core/gui/AbstractPage.java) constructor and [IDriverPool](https://github.com/zebrunner/carina/blob/master/carina-webdriver/src/main/java/com/qaprosoft/carina/core/foundation/webdriver/IDriverPool.java) getDriver() method.

**API**

Expand All @@ -67,7 +67,7 @@ public void testCreateUser() throws Exception {
}
```

Debug entry point at : [AbstractApiMethodV2](https://github.com/qaprosoft/carina/blob/master/carina-api/src/main/java/com/qaprosoft/carina/core/foundation/api/AbstractApiMethodV2.java) constructor.
Debug entry point at : [AbstractApiMethodV2](https://github.com/zebrunner/carina/blob/master/carina-api/src/main/java/com/qaprosoft/carina/core/foundation/api/AbstractApiMethodV2.java) constructor.

**Database**

Expand All @@ -90,4 +90,4 @@ public void createUser() {
}
```

These are user's classes, samples at carina-demo: [UserMapper](https://github.com/qaprosoft/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/db/mappers/UserMapper.java), [ConnectionFactory](https://github.com/qaprosoft/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/utils/ConnectionFactory.java), [User](https://github.com/qaprosoft/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/db/models/User.java).
These are user's classes, samples at carina-demo: [UserMapper](https://github.com/zebrunner/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/db/mappers/UserMapper.java), [ConnectionFactory](https://github.com/zebrunner/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/utils/ConnectionFactory.java), [User](https://github.com/zebrunner/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/db/models/User.java).
4 changes: 2 additions & 2 deletions docs/automation/mobile.md
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ Be sure your image size is less than the real screen size. Real iOS screen sizes

### How to change context of application

In carina-demo there is an example of a [tool](https://github.com/qaprosoft/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/utils/MobileContextUtils.java),
that can change context of application. Just add needed context as a field in [View](https://github.com/qaprosoft/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/utils/MobileContextUtils.java#L51) enum.
In carina-demo there is an example of a [tool](https://github.com/zebrunner/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/utils/MobileContextUtils.java),
that can change context of application. Just add needed context as a field in [View](https://github.com/zebrunner/carina-demo/blob/master/src/main/java/com/qaprosoft/carina/demo/utils/MobileContextUtils.java#L51) enum.
```
// for example
NATIVE("NATIVE_APP"),
Expand Down
2 changes: 1 addition & 1 deletion docs/automation/web.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Note: Starting from 7.0.4 consider that instead of `extends AbstractTest` we have to `implements IAbstractTest` interface

Carina framework follows Selenium best practices for web test automation. If you are familiar with Selenium WebDriver and have already implemented a few tests with the Page Object Pattern, the following guide will be much easier for understanding. We have chosen [GSM Arena](https://www.gsmarena.com/) public web site for demonstration purposes, the whole test source code is located in [carina-demo](https://github.com/qaprosoft/carina-demo) Github repo.
Carina framework follows Selenium best practices for web test automation. If you are familiar with Selenium WebDriver and have already implemented a few tests with the Page Object Pattern, the following guide will be much easier for understanding. We have chosen [GSM Arena](https://www.gsmarena.com/) public web site for demonstration purposes, the whole test source code is located in [carina-demo](https://github.com/zebrunner/carina-demo) Github repo.


### Implementation of Page Objects
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ test_run_rules=PRIORITY=>!!P1;;OWNER=>Josh&&!!Jake;;TAGS=>feature=web&&!!type=sm
```

### [Zebrunner Reporting](https://zebrunner.com/documentation/agents/testng) configuration
[**agent.properties**](https://github.com/qaprosoft/carina-demo/blob/master/src/main/resources/agent.properties) file is used for Zebrunner Reporting integration, here you should specify some values for a proper integration:
[**agent.properties**](https://github.com/zebrunner/carina-demo/blob/master/src/main/resources/agent.properties) file is used for Zebrunner Reporting integration, here you should specify some values for a proper integration:
<table>
<tr>
<th>Attribute</th>
Expand Down
4 changes: 2 additions & 2 deletions docs/contribution.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Configure ssh connection based on git documentation [https://help.github.com/articles/connecting-to-github-with-ssh](https://help.github.com/articles/connecting-to-github-with-ssh).

1) **Fork repository** `https://github.com/qaprosoft/carina` to your own user.
1) **Fork repository** `https://github.com/zebrunner/carina` to your own user.

2) **Clone your fork to your local machine**:

Expand All @@ -20,4 +20,4 @@ And then, after adding the files (`git add` ...), use `git commit` (add descript

git push origin work_local_branch:work_remote_branch

And on [https://github.com/qaprosoft/carina](https://github.com/qaprosoft/carina) you will see the possibility to "Compare & Pull Request"
And on [https://github.com/zebrunner/carina](https://github.com/zebrunner/carina) you will see the possibility to "Compare & Pull Request"
Binary file modified docs/img/carina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img/zebrunner_intro.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Carina is a Java-based test automation framework that unites all testing layers: Mobile applications (web, native, hybrid), WEB applications, REST services, Databases.

<B>[TRY DEMO PROJECT NOW](https://github.com/qaprosoft/carina-demo)</B>
<B>[TRY DEMO PROJECT NOW](https://github.com/zebrunner/carina-demo)</B>

![Alt text](img/carina_space.png "Carina Overview")

Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ pages:
- Contribution: contribution.md
theme:
name: 'material'
repo_url: https://github.com/qaprosoft/carina
repo_url: https://github.com/zebrunner/carina
repo_name: Github
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</developer>
</developers>
<scm>
<url>https://github.com/qaprosoft/carina.git</url>
<url>https://github.com/zebrunner/carina.git</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down

0 comments on commit 9f12b6f

Please sign in to comment.